merge-recursive: add handling for rename/rename/add-dest/add-dest
Each side of the rename in rename/rename(1to2) could potentially also be involved in a rename/add conflict. Ensure stages for such conflicts are also recorded. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 11, 2011 at 23:20 UTC
1ac91b32b5f153a91c10fb236a3769541be60ae9
2 files changed
+20
-3
merge-recursive.c
+19
-2
@@ -1071,6 +1071,19 @@ static void conflict_rename_delete(struct merge_options *o,
1071
"rename", "renamed");
1072
}
1073
1074
+static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1075
+ struct stage_data *entry,
1076
+ int stage)
1077
+{
1078
+ unsigned char *sha = entry->stages[stage].sha;
1079
+ unsigned mode = entry->stages[stage].mode;
1080
+ if (mode == 0 || is_null_sha1(sha))
1081
+ return NULL;
1082
+ hashcpy(target->sha1, sha);
1083
+ target->mode = mode;
1084
+ return target;
1085
+}
1086
+
1087
static void conflict_rename_rename_1to2(struct merge_options *o,
1088
struct rename_conflict_info *ci)
1089
{
@@ -1116,8 +1129,12 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
1129
remove_file_from_cache(a->path);
1130
remove_file_from_cache(b->path);
1131
} else {
1119
- update_stages(a->path, NULL, a, NULL);
1120
- update_stages(b->path, NULL, NULL, b);
1132
+ struct diff_filespec other;
1133
+ update_stages(a->path, NULL,
1134
+ a, filespec_from_entry(&other, ci->dst_entry1, 3));
1135
+
1136
+ update_stages(b->path, NULL,
1137
+ filespec_from_entry(&other, ci->dst_entry2, 2), b);
1138
1139
update_file(o, 0, a->sha1, a->mode, dst_name_a);
1140
update_file(o, 0, b->sha1, b->mode, dst_name_b);
t/t6042-merge-rename-corner-cases.sh
+1
-1
@@ -551,7 +551,7 @@ test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
551
git commit -m two
552
'
553
554
-test_expect_failure 'rename/rename/add-dest merge still knows about conflicting file versions' '
554
+test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
555
git checkout C^0 &&
556
test_must_fail git merge -s recursive B^0 &&
557