git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Glen Choo <chooglen@google.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: Bug in merge-ort (rename detection can have collisions?)
Date: Fri, 10 Jun 2022 09:53:28 -0700	[thread overview]
Message-ID: <xmqqczfgfojb.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BEW2WF5AJeKqCiL2zhcPwPH-u6p=myoX_GkU6tbV=+TZA@mail.gmail.com> (Elijah Newren's message of "Thu, 9 Jun 2022 23:41:06 -0700")

Elijah Newren <newren@gmail.com> writes:

> On Tue, Jun 7, 2022 at 5:11 PM Glen Choo <chooglen@google.com> wrote:
>>
>> (I'm not 100% what the bug _is_, only that there is one.)
>>
>> = Report
>>
>> At $DAYJOB, there was a report that "git merge" was failing on certain
>> branches. Fortunately, the repo is publicly accessible, so I can share
>> the full reproduction recipe:
>> ...
> Thanks for the detailed report; very cool.  Interestingly, if you
> reverse the direction of the merge (checkout origin/upstream-master
> and merge origin/master) then you get a different error:
> ...
> Anyway, long story short...I don't have a fix yet, but just thought
> I'd mention I saw the email and spent some hours digging in.

Thanks for continued support for the ort strategy.  From the very
beginning, I was hesitant to make our tools try to be too clever
with excessive heuristics, but at least we are not making a silent
mismerge in this case, so it is probably OK, especially with "-s
recursive" still left as an escape hatch.

  reply	other threads:[~2022-06-10 16:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-08  0:11 Bug in merge-ort (rename detection can have collisions?) Glen Choo
2022-06-10  6:41 ` Elijah Newren
2022-06-10 16:53   ` Junio C Hamano [this message]
2022-06-11  8:56     ` Elijah Newren
2022-06-13 16:52       ` Glen Choo
2022-06-22  4:30         ` Elijah Newren
2022-06-22 16:58           ` Glen Choo

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=xmqqczfgfojb.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=chooglen@google.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).