From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: Re: [Git] recursive merge on 'master' severely broken?
Date: Wed, 11 Apr 2018 18:57:30 +0900 [thread overview]
Message-ID: <xmqqefjm3w1h.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqin8y3yf1.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Wed, 11 Apr 2018 18:06:10 +0900")
Junio C Hamano <gitster@pobox.com> writes:
> Another interim report.
>
> I do not yet know which one of the ~30 individual commmits is the
> real culprit, ...
It bisects down to c5b761fb ("merge-recursive: ensure we write
updates for directory-renamed file", 2018-02-14); given that a part
of the symptom I saw was a few messages like these:
...
CONFLICT (content): Merge conflict in upload-pack.c
error: addinfo_cache failed for path 'sha1-name.c'
error: addinfo_cache failed for path 'sha1-file.c'
Auto-merging sequencer.c
...
and the patch does change code around the callsites to
add_cacheinfo(), it does look like a plausible culprit.
next prev parent reply other threads:[~2018-04-11 9:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-11 7:19 [Git] recursive merge on 'master' severely broken? Junio C Hamano
2018-04-11 9:06 ` Junio C Hamano
2018-04-11 9:57 ` Junio C Hamano [this message]
2018-04-11 15:51 ` Elijah Newren
2018-04-12 1:37 ` Junio C Hamano
2018-04-13 19:56 ` [RFC PATCH v9 0/30] Add directory rename detection to git Elijah Newren
2018-04-13 19:56 ` [PATCH v9 29.25/30] merge-recursive: improve output precision around skipping updates Elijah Newren
2018-04-13 19:56 ` [PATCH v9 29.50/30] t6046: testcases checking whether updates can be skipped in a merge Elijah Newren
2018-04-13 21:03 ` Stefan Beller
2018-04-13 19:56 ` [PATCH v9 29.75/30] merge-recursive: Fix was_tracked() to quit lying with some renamed paths Elijah Newren
2018-04-16 0:37 ` Junio C Hamano
2018-04-16 21:21 ` Elijah Newren
2018-04-13 19:56 ` [PATCH v9 30/30] merge-recursive: fix check for skipability of working tree updates Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqefjm3w1h.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).