diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-23 22:21:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-23 22:21:01 (GMT) |
| commit | d45b7f40b30833b0fff87a734044f465a26f40c9 (patch) | |
| tree | 30cfade4f6ec2d4f173bc7480aecdaec9a945103 /merge-recursive.c | |
| parent | 5ec8217eb6c89974fda94808a310aa651577b25d (diff) | |
| download | git-d45b7f40b30833b0fff87a734044f465a26f40c9.zip git-d45b7f40b30833b0fff87a734044f465a26f40c9.tar.gz git-d45b7f40b30833b0fff87a734044f465a26f40c9.tar.bz2 | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6bbc451..3efc04e 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 |