Junio C HamanoFix 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> ---
* The regression this fixes was seen while I was preparing a merge of maint (soon to become 1.7.6.4) back to master (I cannot write "soon to become 1.7.7" because I want to cook the fix at least for a few days) today.
merge-recursive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to merge-recursive.c +1 −1
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
-- 1.7.7.rc2.4.g5ec82