git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
To: Elijah Newren <newren@gmail.com>, Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Aug 2018, #06; Wed, 29)
Date: Sat, 01 Sep 2018 10:02:09 +0530	[thread overview]
Message-ID: <9C8E369D-CC7C-4030-B02A-287F4CCD6712@gmail.com> (raw)
In-Reply-To: <CABPp-BE43kFwRZ90-EWB9Em6xk-T=QfNXCepY=0O5OYYZe-qAg@mail.gmail.com>



On 30 August 2018 21:41:35 GMT+05:30, Elijah Newren <newren@gmail.com> wrote:
>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".

FWIW, this sounds better to me than the original.
-- 
Sivaraam

Sent from my Android device with K-9 Mail. Please excuse my brevity.

  parent reply	other threads:[~2018-09-01  4:40 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
2018-09-01  4:32       ` Kaartic Sivaraam [this message]
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9C8E369D-CC7C-4030-B02A-287F4CCD6712@gmail.com \
    --to=kaartic.sivaraam@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --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. 
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 NNTP newsgroup(s).