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: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Aug 2018, #06; Wed, 29)
Date: Fri, 31 Aug 2018 12:53:09 -0700	[thread overview]
Message-ID: <xmqqr2ie1ffe.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BE43kFwRZ90-EWB9Em6xk-T=QfNXCepY=0O5OYYZe-qAg@mail.gmail.com> (Elijah Newren's message of "Thu, 30 Aug 2018 09:11:35 -0700")

Elijah Newren <newren@gmail.com> writes:

>> Suggestions for a better rewrite is very much appreciated.
>
> That makes sense.  I'm not sure I can concisely convey all the right
> points, but here's a stab at rewording:
>
> Recent addition of "directory rename" heuristics to the
> merge-recursive backend makes the command susceptible to false
> positives and false negatives.  In the context of "git am -3", which
> does not know about surrounding unmodified paths and thus cannot
> inform the merge machinery about the full trees involved, this risk is
> particularly severe.  As such, the heuristic is disabled for "git am
> -3" to keep the machinery "more stupid but predictable".

Excellent.  Let me use that when merging it to 'next'.

  reply	other threads:[~2018-08-31 19:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-29 22:35 What's cooking in git.git (Aug 2018, #06; Wed, 29) Junio C Hamano
2018-08-30  0:22 ` Elijah Newren
2018-08-30 15:44   ` Junio C Hamano
2018-08-30 16:11     ` Elijah Newren
2018-08-31 19:53       ` Junio C Hamano [this message]
2018-09-01  4:32       ` Kaartic Sivaraam
2018-08-30 14:01 ` es/format-patch-{inter,range}diff, was " Johannes Schindelin
2018-09-03  4:23 ` Stephen & Linda Smith

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=xmqqr2ie1ffe.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).