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

Re: [RFC] git-am: handling unborn branches

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 5, 2015, 15:36 UTC
Message-ID
<xmqqfv66tbei.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CACRoPnS9UK0ebD2JdSfun8+F0MXj6Loza4Y07whqbO6tV4_APQ@mail.gmail.com>
Paul Tan <pyokagan@gmail.com> writes:
Show 8 quoted lines
> Hmm, actually git-am.sh doesn't seem to do that even when we have a
> history to apply patches to. This is okay in the non-3way case, as
> git-apply will check to see if the patch applies before it modifies
> the index, but if we fall back on 3-way merge, any new files the
> failed merge added will not be deleted in the "git read-tree --reset
> -u HEAD HEAD".
>
> Should we do that?

That sounds like the right thing to do; I agree that fixing it may or may not be outside the scope of the immediate series.

Previous: Paul TanNext: Paul Tan
Message 4 of 8 in “[RFC] git-am: handling unborn branches”
  1. Paul TanJun 4, 2015
  2. Junio C HamanoJun 4, 2015
  3. Paul TanJun 5, 2015
  4. Junio C HamanoJun 5, 2015
  5. Paul TanJun 5, 2015
  6. Junio C HamanoJun 5, 2015
  7. Stefan BellerJun 4, 2015
  8. Paul TanJun 5, 2015

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.