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

Re: [PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 19, 2015, 17:55 UTC
Message-ID
<xmqqy4h79n93.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20150819082222.GA27685@potato.chippynet.com>
Paul Tan <pyokagan@gmail.com> writes:
> (In addition, I fixed a small mistake with the "struct tree_desc" array
> size.)

Yeah, one thing I forgot to mention was that I suspect this kind of "oneway merge" already in other places in the code, and a future mini-project might be to inspect them all and try to see if their commonalities can be taken advantage of. If we had a small helper function to do the "do the equivalent of 'git reset $TREE'", this miscounting wouldn't have happened.

The change looks sensible.  Thanks.
Previous: Paul Tan
Message 9 of 9 in “"git am --abort" screwing up index?”
  1. Linus TorvaldsAug 16, 2015
  2. Linus TorvaldsAug 16, 2015
  3. Johannes SchindelinAug 17, 2015
  4. am --abort: merge ORIG_HEAD tree into indexPaul Tan, Aug 17, 2015
  5. Johannes SchindelinAug 17, 2015
  6. Linus TorvaldsAug 17, 2015
  7. Junio C HamanoAug 17, 2015
  8. am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan, Aug 19, 2015
  9. Junio C HamanoAug 19, 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.