{"thread":{"id":"28476","subject":"[PATCH] merge-recursive: Do not look at working tree during a virtual ancestor merge","startedAt":"2011-09-23T22:29:54Z","lastAt":"2011-09-23T22:29:54Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"176107","messageId":"7vzkhusxi5.fsf@alter.siamese.dyndns.org","threadId":"28476","inReplyTo":null,"subject":"[PATCH] merge-recursive: Do not look at working tree during a virtual ancestor merge","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-09-23T22:29:54Z","receivedAt":"2011-09-23T22:29:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Fix another instance of a recursive merge incorrectly paying attention to\nthe working tree file during a virtual ancestor merge, that resulted in\nspurious and useless \"addinfo_cache failed\" error message.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n\n * The regression this fixes was seen while I was preparing a merge of\n   maint (soon to become 1.7.6.4) back to master (I cannot write \"soon to\n   become 1.7.7\" because I want to cook the fix at least for a few days)\n   today.\n\n merge-recursive.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 6bbc451..3efc04e 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -1627,7 +1627,7 @@ static int merge_content(struct merge_options *o,\n \t\tpath_renamed_outside_HEAD = !path2 || !strcmp(path, path2);\n \t\tif (!path_renamed_outside_HEAD) {\n \t\t\tadd_cacheinfo(mfi.mode, mfi.sha, path,\n-\t\t\t\t      0 /*stage*/, 1 /*refresh*/, 0 /*options*/);\n+\t\t\t\t      0, (!o->call_depth), 0);\n \t\t\treturn mfi.clean;\n \t\t}\n \t} else\n-- \n1.7.7.rc2.4.g5ec82\n"}]}