Re: [PATCH] 3-way merge with file move fails when diff.renames = copies
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 11, 2008, 00:15 UTC
- Message-ID
- <7vwsfb2k3u.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <7v63mv3zww.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> "David D. Kilzer" <ddkilzer@kilzer.net> writes: > >> With diff.renames = copies, a 3-way merge (e.g. "git rebase") would >> fail with the following error:
By the way, I think the real issue with this one is that we currently do not disable diff.renames configuration while rebase internally runs "format-patch" to feed "am -3".
The end user configuration for "diff" should not affect the result produced by the higher level command that is related to "diff" only because internally it is implemented in terms of it.
For that matter, I have a feeling that format-patch should not even look at diff.renames, but we seem to have been doing this for a long time so there is no easy way to fix this thinko.
In any case, here is a much straightforward fix for "rebase".
Running "am -3" on a copying patch would still need a patch to the index-info codepath, and my earlier comment on it still stands, but it is irrelevant/orthogonal to your particular test script.
git-rebase.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git c/git-rebase.sh w/git-rebase.sh index 023a6dc..159ccb3 100755 --- c/git-rebase.sh +++ w/git-rebase.sh @@ -429,7 +429,7 @@ fi if test -z "$do_merge" then git format-patch -k --stdout --full-index --ignore-if-in-upstream \ - "$upstream..$orig_head" | + --no-renames "$upstream..$orig_head" | git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" && move_to_original_branch ret=$?