[PATCH 22/37] merge-recursive: Have process_entry() skip D/F or rename entries
- From
Elijah Newren <newren@gmail.com>
- Date
- Sep 20, 2010, 08:28 UTC
- Message-ID
- <1284971350-30590-23-git-send-email-newren@gmail.com>
- In-Reply-To
- <1284971350-30590-1-git-send-email-newren@gmail.com>
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> --- merge-recursive.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index ec47d56..5326f5e 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 */
-- 1.7.3.271.g16009