From: David D. Kilzer Date: Wed, 21 Jul 2010 19:58:23 GMT Subject: [PATCH] Fix rebase with file move when diff.renames = copies Message-ID: <1279742303-29817-1-git-send-email-ddkilzer@kilzer.net> In-Reply-To: <7vwsfb2k3u.fsf@gitster.siamese.dyndns.org> With diff.renames = copies, a rebase with a file move will fail with the following error: fatal: mode change for , which is not in current HEAD Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001. The bug is that git rebase does not disable diff.renames when it runs format-patch internally to feed into "am -3". The fix is simply to include a --no-renames argument to format-patch to override any local diff.renames setting. Fix by Junio C Hamano. Test case by David D. Kilzer. Signed-off-by: David D. Kilzer --- git-rebase.sh | 2 +- t/t3400-rebase.sh | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 6ec155c..0718caf 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -514,7 +514,7 @@ fi if test -z "$do_merge" then git format-patch -k --stdout --full-index --ignore-if-in-upstream \ - $root_flag "$revisions" | + --no-renames $root_flag "$revisions" | git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" && move_to_original_branch ret=$? diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 4e6a44b..6d2ec91 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -155,4 +155,21 @@ test_expect_success 'Rebase a commit that sprinkles CRs in' ' git diff --exit-code file-with-cr:CR HEAD:CR ' +test_expect_success 'rebase a single file move with diff.renames = copies' ' + git config diff.renames copies && + git checkout master && + echo 1 > Y && + git add Y && + test_tick && + git commit -m "prepare file move" && + git checkout -b filemove HEAD^ && + echo 1 > Y && + git add Y && + mkdir D && + git mv A D/A && + test_tick && + git commit -m filemove && + GIT_TRACE=1 git rebase master +' + test_done -- 1.7.1