update cache for conflicting submodule entries

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index ee853b990d8bfb15e0058fefbbd267bd58ed40fc..3618c94bd2e4722bab29bff8ee7d530c430029ce 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1123,10 +1123,11 @@ static int process_entry(struct merge_options *o,
                clean_merge = mfi.clean;
                if (mfi.clean)
                        update_file(o, 1, mfi.sha, mfi.mode, path);
-               else if (S_ISGITLINK(mfi.mode))
+               else if (S_ISGITLINK(mfi.mode)) {
                        output(o, 1, "CONFLICT (submodule): Merge conflict in %s "
                               "- needs %s", path, sha1_to_hex(b.sha1));
-               else {
+                       update_file(o, 0, mfi.sha, mfi.mode, path);
+               } else {
                        output(o, 1, "CONFLICT (%s): Merge conflict in %s",
                                        reason, path);