From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Sep 2011 22:21:01 +0000 (-0700)
Subject: merge-recursive: Do not look at working tree during a virtual ancestor merge
X-Git-Tag: v1.7.7-rc3~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d45b7f40b30833b0fff87a734044f465a26f40c9;p=git.git

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>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 6bbc4512a..3efc04e04 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