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

diff --git a/merge-recursive.c b/merge-recursive.c
index c34a4f148..e22a5195f 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -265,7 +265,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 
 	if (!cache_tree_fully_valid(active_cache_tree) &&
 	    cache_tree_update(active_cache_tree,
-			      active_cache, active_nr, 0, 0) < 0)
+			      active_cache, active_nr, 0, 0, 0) < 0)
 		die("error building trees");
 
 	result = lookup_tree(active_cache_tree->sha1);
@@ -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);