summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-23 15:21:01 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-23 15:21:01 -0700
commitd45b7f40b30833b0fff87a734044f465a26f40c9 (patch)
tree30cfade4f6ec2d4f173bc7480aecdaec9a945103 /merge-recursive.c
parent5ec8217eb6c89974fda94808a310aa651577b25d (diff)
downloadgit-d45b7f40b30833b0fff87a734044f465a26f40c9.tar.gz
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 6bbc4512a9..3efc04e04f 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