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

Re: git-cherry-pick and git-commit --amend in version 1.7.6.4

From
Jay Soffian <jaysoffian@gmail.com>
Date
Oct 6, 2011, 00:08 UTC
Message-ID
<CAG+J_DxJ25bBo0=30+9r3+kwy+u4M9ZdihnctsMYis+zgbduEg@mail.gmail.com>
In-Reply-To
<7vhb3n5asv.fsf@alter.siamese.dyndns.org>
On Wed, Oct 5, 2011 at 6:32 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Does it also refrain from creating sequencer state directory?
I'm not familiar with the sequencer code. It's not in master is it?

What's happening here is that do_pick_commit() was creating CHERRY_PICK_HEAD, but then git aborts several call sites away (do_recursive_merge -> merge_trees -> git_merge_trees -> unpack_trees -> display_error_msgs).

So I think do_pick_commit() needs to defer creating CHERRY_PICK_HEAD till after the possible abort.

I don't know if that's the right fix for next or not, but it seems correct for master.

j.
Previous: Junio C HamanoNext: Junio C Hamano
Message 13 of 16 in “git-cherry-pick and git-commit --amend in version 1.7.6.4”
  1. Nicolas DichtelOct 5, 2011
  2. Jay SoffianOct 5, 2011
  3. Nicolas DichtelOct 6, 2011
  4. Nicolas DichtelOct 6, 2011
  5. Jay SoffianOct 6, 2011
  6. Nicolas DichtelOct 6, 2011
  7. Jay SoffianOct 6, 2011
  8. Junio C HamanoOct 5, 2011
  9. Jay SoffianOct 5, 2011
  10. Junio C HamanoOct 5, 2011
  11. Jay SoffianOct 5, 2011
  12. Junio C HamanoOct 5, 2011
  13. Jay SoffianOct 6, 2011
  14. Junio C HamanoOct 5, 2011
  15. Junio C HamanoOct 5, 2011
  16. Junio C HamanoOct 6, 2011

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.