diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:02 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:04 -0700 |
| commit | 3b130adf9c8b0b37acb0959b84a3222bc22ebcff (patch) | |
| tree | 441c3ce2735d7b968cf28e7b86b01182f6f9adc0 /merge-recursive.c | |
| parent | 161cf7f9490285700432f23a953f8e238f3469f5 (diff) | |
| download | git-3b130adf9c8b0b37acb0959b84a3222bc22ebcff.tar.gz git-3b130adf9c8b0b37acb0959b84a3222bc22ebcff.tar.xz | |
merge-recursive: Delay handling of rename/delete conflicts
Move the handling of rename/delete conflicts from process_renames() to
process_df_entry().
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.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 05d06f720..92b2b849f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1004,8 +1004,20 @@ static int process_renames(struct merge_options *o, try_merge = 0; if (sha_eq(src_other.sha1, null_sha1)) { - clean_merge = 0; - conflict_rename_delete(o, ren1->pair, branch1, branch2); + if (string_list_has_string(&o->current_directory_set, ren1_dst)) { + ren1->dst_entry->processed = 0; + setup_rename_df_conflict_info(RENAME_DELETE, + ren1->pair, + NULL, + branch1, + branch2, + ren1->dst_entry, + NULL); + remove_file(o, 0, ren1_dst, 0); + } else { + clean_merge = 0; + conflict_rename_delete(o, ren1->pair, branch1, branch2); + } } else if ((dst_other.mode == ren1->pair->two->mode) && sha_eq(dst_other.sha1, ren1->pair->two->sha1)) { /* Added file on the other side @@ -1346,6 +1358,12 @@ static int process_df_entry(struct merge_options *o, struct rename_df_conflict_info *conflict_info = entry->rename_df_conflict_info; char *src; switch (conflict_info->rename_type) { + case RENAME_DELETE: + clean_merge = 0; + conflict_rename_delete(o, conflict_info->pair1, + conflict_info->branch1, + conflict_info->branch2); + break; case RENAME_ONE_FILE_TO_TWO: src = conflict_info->pair1->one->path; clean_merge = 0; |