From: Linus Torvalds <torvalds@linux-foundation.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Optimizing writes to unchanged files during merges?
Date: Thu, 12 Apr 2018 16:35:19 -0700 [thread overview]
Message-ID: <CA+55aFxA9YVLoh_23V8Hi+X7ODEmqg-dhdAYZz1jbq5JhXqBFw@mail.gmail.com> (raw)
In-Reply-To: <xmqqtvsg10bu.fsf@gitster-ct.c.googlers.com>
On Thu, Apr 12, 2018 at 4:17 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> A bit of detour. "Change in side branch happened to be a subset of
> the change in trunk and gets subsumed, but we end up writing the
> same result" happens also with the simpler resolve strategy.
>
> Here is a fix.
Heh. Except git-merge-one-file.sh is *only* used for that case, so
this doesn't fix the normal case.
I verified that the normal case situation is that
"update_file_flags()" thing that checks out the end result.
It's called by this case:
} else if (a_oid && b_oid) {
/* Case C: Added in both (check for same permissions) and */
/* case D: Modified in both, but differently. */
clean_merge = merge_content(o, path,
o_oid, o_mode, a_oid,
a_mode, b_oid, b_mode,
NULL);
in process_entry(), and I think we could just there add a test for if
o_old,o_mod == a_oid,a_mode or something?
Linus
next prev parent reply other threads:[~2018-04-12 23:35 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-12 21:14 Optimizing writes to unchanged files during merges? Linus Torvalds
2018-04-12 21:46 ` Junio C Hamano
2018-04-12 23:17 ` Junio C Hamano
2018-04-12 23:35 ` Linus Torvalds [this message]
2018-04-12 23:41 ` Linus Torvalds
2018-04-12 23:55 ` Linus Torvalds
2018-04-13 0:01 ` Linus Torvalds
2018-04-13 7:02 ` Elijah Newren
2018-04-13 17:14 ` Linus Torvalds
2018-04-13 17:39 ` Stefan Beller
2018-04-13 17:53 ` Linus Torvalds
2018-04-13 20:04 ` Elijah Newren
2018-04-13 22:27 ` Junio C Hamano
2018-04-16 1:44 ` Junio C Hamano
2018-04-16 2:03 ` Linus Torvalds
2018-04-16 16:07 ` Lars Schneider
2018-04-16 17:04 ` Ævar Arnfjörð Bjarmason
2018-04-17 17:23 ` Lars Schneider
2018-04-16 17:43 ` Jacob Keller
2018-04-16 17:45 ` Jacob Keller
2018-04-16 22:34 ` Junio C Hamano
2018-04-17 17:27 ` Lars Schneider
2018-04-17 17:43 ` Jacob Keller
2018-04-16 17:47 ` Phillip Wood
2018-04-16 20:09 ` Stefan Haller
2018-04-16 22:55 ` Elijah Newren
2018-04-16 23:03 ` Elijah Newren
2018-04-12 23:18 ` Linus Torvalds
2018-04-13 0:01 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+55aFxA9YVLoh_23V8Hi+X7ODEmqg-dhdAYZz1jbq5JhXqBFw@mail.gmail.com \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).