git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: What's cooking in git.git (Aug 2018, #06; Wed, 29)

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 31, 2018, 19:53 UTC
Message-ID
<xmqqr2ie1ffe.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CABPp-BE43kFwRZ90-EWB9Em6xk-T=QfNXCepY=0O5OYYZe-qAg@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 12 quoted lines
>> 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'.
Previous: Elijah NewrenNext: Kaartic Sivaraam
Message 5 of 8 in “What's cooking in git.git (Aug 2018, #06; Wed, 29)”
  1. Junio C HamanoAug 29, 2018
  2. Elijah NewrenAug 30, 2018
  3. Junio C HamanoAug 30, 2018
  4. Elijah NewrenAug 30, 2018
  5. Junio C HamanoAug 31, 2018
  6. Kaartic SivaraamSep 1, 2018
  7. es/format-patch-{inter,range}diff, was Re: What's cooking in git.git (Aug 2018, #06; Wed, 29)Johannes Schindelin, Aug 30, 2018
  8. Stephen & Linda SmithSep 3, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.