merge-recursive: Do not look at working tree during a virtual ancestor 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 <gitster@pobox.com>
Junio C Hamano committed
Sep 23, 2011 at 15:21 UTC
d45b7f40b30833b0fff87a734044f465a26f40c9
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -1627,7 +1627,7 @@ static int merge_content(struct merge_options *o,
1627
path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
1628
if (!path_renamed_outside_HEAD) {
1629
add_cacheinfo(mfi.mode, mfi.sha, path,
1630
- 0 /*stage*/, 1 /*refresh*/, 0 /*options*/);
1630
+ 0, (!o->call_depth), 0);
1631
return mfi.clean;
1632
}
1633
} else