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

Re: [PATCH 5/6] am --abort: support aborting to unborn branch

From
Paul Tan <pyokagan@gmail.com>
Date
Jun 9, 2015, 09:18 UTC
Message-ID
<CACRoPnQft7p1QrVwYaKcBnyoAkZLm0uOaf84E+jrdDUb8myweg@mail.gmail.com>
In-Reply-To
<xmqq8ubu9d1a.fsf@gitster.dls.corp.google.com>
On Tue, Jun 9, 2015 at 4:10 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 8 quoted lines
> Paul Tan <pyokagan@gmail.com> writes:
>
>> When git-am is first run on an unborn branch, no ORIG_HEAD is created.
>> As such, any applied commits will remain even after a git am --abort.
>
> I think this answered my question on 4/6; that may indicate that
> these two are either done in a wrong order or perhaps should be a
> single change.

Ah right, patch 4/6 was too sneaky in that it tried to do the "support unborn branch" thing as well, which should only be handled in this patch.

I still think the patches should be separate though since they are conceptually different. 4/6 modifies the "index clean up" function, while 5/6 modifies the "reset HEAD" function.

Thanks, Paul

Previous: Junio C HamanoNext: Paul Tan
Message 9 of 13 in “am --skip/--abort: improve index/worktree cleanup”
  1. 0/6 am --skip/--abort: improve index/worktree cleanupPaul Tan, Jun 6, 2015
  2. 1/6 am --skip: revert changes introduced by failed 3way mergePaul Tan, Jun 6, 2015
  3. 2/6 am -3: support 3way merge on unborn branchPaul Tan, Jun 6, 2015
  4. 3/6 am --skip: support skipping while on unborn branchPaul Tan, Jun 6, 2015
  5. 4/6 am --abort: revert changes introduced by failed 3way mergePaul Tan, Jun 6, 2015
  6. Junio C HamanoJun 8, 2015
  7. 5/6 am --abort: support aborting to unborn branchPaul Tan, Jun 6, 2015
  8. Junio C HamanoJun 8, 2015
  9. Paul TanJun 9, 2015
  10. 6/6 am --abort: keep unrelated commits on unborn branchPaul Tan, Jun 6, 2015
  11. Junio C HamanoJun 8, 2015
  12. Paul TanJun 9, 2015
  13. Stefan BellerJun 8, 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.