diff options
| author | Elijah Newren <newren@gmail.com> | 2018-11-07 20:40:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-08 14:23:53 +0900 |
| commit | dcf2815098589b1fa0a01e7a8459c213581d4412 (patch) | |
| tree | 299e3fd79ba582cf0aaa7636e5e93f731a28dca4 /merge-recursive.c | |
| parent | bbafc9c44ae7109f636772350934b3c5d747da44 (diff) | |
| download | git-dcf2815098589b1fa0a01e7a8459c213581d4412.tar.gz git-dcf2815098589b1fa0a01e7a8459c213581d4412.tar.xz | |
merge-recursive: use handle_file_collision for add/add conflicts
This results in no-net change of behavior, it simply ensures that all
file-collision conflict handling types are being handled the same by
calling the same function.
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 | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ead6054a7..c78b34711 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3355,14 +3355,27 @@ static int process_entry(struct merge_options *o, clean_merge = -1; } } else if (a_oid && b_oid) { - /* Case C: Added in both (check for same permissions) and */ - /* case D: Modified in both, but differently. */ - int is_dirty = 0; /* unpack_trees would have bailed if dirty */ - clean_merge = handle_content_merge(o, path, is_dirty, - o_oid, o_mode, - a_oid, a_mode, - b_oid, b_mode, - NULL); + if (!o_oid) { + /* Case C: Added in both (check for same permissions) */ + output(o, 1, + _("CONFLICT (add/add): Merge conflict in %s"), + path); + clean_merge = handle_file_collision(o, + path, NULL, NULL, + o->branch1, + o->branch2, + a_oid, a_mode, + b_oid, b_mode); + } else { + /* case D: Modified in both, but differently. */ + int is_dirty = 0; /* unpack_trees would have bailed if dirty */ + clean_merge = handle_content_merge(o, path, + is_dirty, + o_oid, o_mode, + a_oid, a_mode, + b_oid, b_mode, + NULL); + } } else if (!o_oid && !a_oid && !b_oid) { /* * this entry was deleted altogether. a_mode == 0 means |