X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-recursive.c;h=a3721efcaf9458e5c735b45794d60bac670366d2;hb=8146f19762c8fd67f6df3da4ba87a4e5ea880909;hp=d6f0582238cac037a9779c905b7ece55b9d21ac1;hpb=6da14ee14f85fe5766780e1cbe8d42d385638e9e;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index d6f058223..a3721efca 100644
--- 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)