X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=cc664c39b66b0bb499dec13a22880a6096423fa6;hb=bd193f46b70fd3f8a55e2a8dcbb1fb2b4eec13d6;hp=c34a4f148b65cf81f28e2aed6c35e141e175b324;hpb=dddc411f7abbd82f6fa7d323711b8a7b94a1abc2;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index c34a4f148..cc664c39b 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -946,8 +946,10 @@ static struct merge_file_info merge_file_1(struct merge_options *o,
 			free(result_buf.ptr);
 			result.clean = (merge_status == 0);
 		} else if (S_ISGITLINK(a->mode)) {
-			result.clean = merge_submodule(result.sha, one->path, one->sha1,
-						       a->sha1, b->sha1);
+			result.clean = merge_submodule(result.sha,
+						       one->path, one->sha1,
+						       a->sha1, b->sha1,
+						       !o->call_depth);
 		} else if (S_ISLNK(a->mode)) {
 			hashcpy(result.sha, a->sha1);