X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=c34a4f148b65cf81f28e2aed6c35e141e175b324;hb=c07aa5b218b9f519c29b5be71fe43cd79365dd37;hp=8148a4fab3abfa803e57edf062f155224ef28626;hpb=f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 8148a4fab..c34a4f148 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1627,7 +1627,7 @@ static int merge_content(struct merge_options *o,
 		path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
 		if (!path_renamed_outside_HEAD) {
 			add_cacheinfo(mfi.mode, mfi.sha, path,
-				      0 /*stage*/, 1 /*refresh*/, 0 /*options*/);
+				      0, (!o->call_depth), 0);
 			return mfi.clean;
 		}
 	} else