[PATCH 4/5] merge_recursive: Fix renames across paths below D/F conflicts
From: <hidden>
Date: 2016-06-15 22:49:01
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Elijah Newren <redacted> Signed-off-by: Elijah Newren <redacted> --- I'm a little uneasy with this change, mainly because I don't fully understand the rename processing logic (I was actually kind of surprised when I made these changes and it worked). Although I verified that these changes (and my others in this patch series) introduce no new breakages in the testsuite and even fix a known issue, I'm still not quite sure I follow the logic well enough to feel fully confident in this change. I'm particularly worried I may have neglected some closely related cases that I should have fixed but which may still be broken. merge-recursive.c | 13 +++++++++++-- t/t6020-merge-df.sh | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 8d70fc0..ab0743f 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c@@ -1019,14 +1019,23 @@ static int process_renames(struct merge_options *o, if (mfi.clean && sha_eq(mfi.sha, ren1->pair->two->sha1) && - mfi.mode == ren1->pair->two->mode) + mfi.mode == ren1->pair->two->mode) { /* * This messaged is part of * t6022 test. If you change * it update the test too. */ output(o, 3, "Skipped %s (merged same as existing)", ren1_dst); - else { + + /* If this was a rename across a path involved + * in a D/F conflict, there may be more work to + * do. + */ + for (i=1; i<=3; ++i) { + if (ren1->dst_entry->stages[i].mode) + ren1->dst_entry->processed = 0; + } + } else { if (mfi.merge || !mfi.clean) output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst); if (mfi.merge)
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index 99acb89..7278eee 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh@@ -22,7 +22,7 @@ git commit -m "File: dir"' test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master' -test_expect_failure 'F/D conflict' ' +test_expect_success 'F/D conflict' ' git reset --hard && git checkout master && rm .git/index &&
@@ -72,7 +72,7 @@ test_expect_success 'Setup rename across paths each below D/F conflicts' ' git commit -m "f1" ' -test_expect_failure 'Test rename across paths below D/F conflicts' ' +test_expect_success 'Test rename across paths below D/F conflicts' ' git checkout newmaster && git cherry-pick branch '
--
1.7.2.rc0.212.g0c601