merge-recursive: Do not look at working tree during a virtual ancesto…

…r merge Fix another instance of a recursive merge incorrectly paying attention to the working tree file during a virtual ancestor merge, that resulted in spurious and useless "addinfo_cache failed" error message. Signed-off-by: Junio C Hamano <[email protected]>
rui314 · Sep 23, 2011 · d45b7f4 · d45b7f4
1 parent 5ec8217
commit d45b7f4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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