merge-recursive: Do not look at working tree during a virtual ancestor merge
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 22:21:01 +0000 (15:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Sep 2011 22:21:01 +0000 (15:21 -0700)
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>
merge-recursive.c

index 6bbc451..3efc04e 100644 (file)
@@ -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