diff options
| author | Clemens Buchacher <drizzd@aon.at> | 2009-04-05 02:47:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-05 00:26:33 -0700 |
| commit | 39d8e271f42e976a61f08a4f7bc2047a682ac532 (patch) | |
| tree | dbf1f297e9e8716ae66e903933e9b3a8af0928c1 /merge-recursive.c | |
| parent | 0eb6574c24241b1e54be1ddff60287544faaf8d8 (diff) | |
| download | git-39d8e271f42e976a61f08a4f7bc2047a682ac532.tar.gz | |
simplify output of conflicting merge
This simplifies the code without changing the semantics and removes
the unhelpful "needs $sha1" part of the conflicting submodule message.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 3618c94bd2..9bf5cc7175 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1121,22 +1121,13 @@ static int process_entry(struct merge_options *o, o->branch1, o->branch2); clean_merge = mfi.clean; - if (mfi.clean) - update_file(o, 1, mfi.sha, mfi.mode, path); - else if (S_ISGITLINK(mfi.mode)) { - output(o, 1, "CONFLICT (submodule): Merge conflict in %s " - "- needs %s", path, sha1_to_hex(b.sha1)); - update_file(o, 0, mfi.sha, mfi.mode, path); - } else { + if (!mfi.clean) { + if (S_ISGITLINK(mfi.mode)) + reason = "submodule"; output(o, 1, "CONFLICT (%s): Merge conflict in %s", reason, path); - - if (o->call_depth) - update_file(o, 0, mfi.sha, mfi.mode, path); - else - update_file_flags(o, mfi.sha, mfi.mode, path, - 0 /* update_cache */, 1 /* update_working_directory */); } + update_file(o, mfi.clean, mfi.sha, mfi.mode, path); } else if (!o_sha && !a_sha && !b_sha) { /* * this entry was deleted altogether. a_mode == 0 means |