merge-recursive: Have process_entry() skip D/F or rename entries
If an entry has an associated rename_df_conflict_info, skip it and allow it to be processed by process_df_entry(). Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Sep 20, 2010 at 02:28 UTC
384c166807e6eefbefa3e9f253216b2aee6d912a
1 file changed
+3
merge-recursive.c
+3
@@ -1267,6 +1267,9 @@ static int process_entry(struct merge_options *o,
1267
unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1268
unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1269
1270
+ if (entry->rename_df_conflict_info)
1271
+ return 1; /* Such cases are handled elsewhere. */
1272
+
1273
entry->processed = 1;
1274
if (o_sha && (!a_sha || !b_sha)) {
1275
/* Case A: Deleted in one */