From: Elijah Newren Date: Mon, 20 Sep 2010 08:28:55 +0000 (-0600) Subject: merge-recursive: Have process_entry() skip D/F or rename entries X-Git-Tag: v1.7.4-rc0~101^2~17 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=384c166807e6eefbefa3e9f253216b2aee6d912a;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/merge-recursive.c b/merge-recursive.c index 2ba05a5b5..319780458 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1267,6 +1267,9 @@ static int process_entry(struct merge_options *o, unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode); unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode); + if (entry->rename_df_conflict_info) + return 1; /* Such cases are handled elsewhere. */ + entry->processed = 1; if (o_sha && (!a_sha || !b_sha)) { /* Case A: Deleted in one */