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, 16:33 UTC
Message-ID
<xmqq3826t8rm.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CACRoPnTjqWrhS0UArSevjp6kUbQL8YYEvvobmykssoo05wjbow@mail.gmail.com>
Paul Tan <pyokagan@gmail.com> writes:
> Hmm, thinking about it, the equivalent C code would be greatly
> affected by whatever behavior we go with, so I think we should try
> fixing the behavior first.

I am glad to see that sometimes people see the light when I say one of the greatest strength in scripted Porcelains is that they are far easier to modify than those writtein in C ;-)

Show 6 quoted lines
> This was done really quickly, but I think this may fix it:
> ...
> However, it assumes that the contents of the index are from the failed
> merge. If the user modified the index before running git-am --skip,
> e.g. the user added a file, then that file would be deleted, which may
> not be desired...

I do not think that is worth worrying about; if users made changes unrelated to what "git am" asked them to help it apply by modifying the working tree and updating the index, don't they "lose" their changes the same way anyway, whether it is a new file or an existing one?

Previous: Paul TanNext: Stefan Beller
Message 6 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.