Merge branch 'ar/unlink-err' into maint

diff --git a/merge-recursive.c b/merge-recursive.c
index d6f0582238cac037a9779c905b7ece55b9d21ac1..a3721efcaf9458e5c735b45794d60bac670366d2 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -520,8 +520,12 @@ static void update_file_flags(struct merge_options *o,
                unsigned long size;
 
                if (S_ISGITLINK(mode))
-                       die("cannot read object %s '%s': It is a submodule!",
-                           sha1_to_hex(sha), path);
+                       /*
+                        * We may later decide to recursively descend into
+                        * the submodule directory and update its index
+                        * and/or work tree, but we do not do that now.
+                        */
+                       goto update_index;
 
                buf = read_sha1_file(sha, &type, &size);
                if (!buf)