summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2010-07-09 07:10:54 -0600
committerJunio C Hamano <gitster@pobox.com>2010-07-09 16:13:00 -0700
commit5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9 (patch)
treef43bd060dd324f749f7d909e27eda7762cd52d84 /merge-recursive.c
parent37348937ff391f01981e8af10b2f615268fd2509 (diff)
downloadgit-5a2580d62f9aaa30f0acd10df9dbe7a581dd77d9.tar.gz
merge_recursive: Fix renames across paths below D/F conflicts
The rename logic in process_renames() handles renames and merging of file contents and then marks files as processed. However, there may be higher stage entries left in the index for other reasons (e.g., due to D/F conflicts). By checking for such cases and marking the entry as not processed, it allows process_entry() later to look at it and handle those higher stages. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index c8d5362191..b0f055ecd4 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1019,14 +1019,25 @@ 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 {
+
+ /* There may be higher stage entries left
+ * in the index (e.g. due to a D/F
+ * conflict) that need to be resolved.
+ */
+ for (i = 1; i <= 3; i++) {
+ if (!ren1->dst_entry->stages[i].mode)
+ continue;
+ ren1->dst_entry->processed = 0;
+ break;
+ }
+ } else {
if (mfi.merge || !mfi.clean)
output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);
if (mfi.merge)