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>

diff --git a/merge-recursive.c b/merge-recursive.c
index 3618c94bd2e4722bab29bff8ee7d530c430029ce..9bf5cc71754df1df29057822cf16bbfe51579d37 100644 (file)
--- 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;
                                 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);
                        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
        } else if (!o_sha && !a_sha && !b_sha) {
                /*
                 * this entry was deleted altogether. a_mode == 0 means