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

Re: [PATCH] rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failed

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Apr 3, 2012, 21:26 UTC
Message-ID
<20120403212650.GD19858@burratino>
In-Reply-To
<4F7B69FE.9010600@sohovfx.com>
Andrew Wong wrote:
Show 6 quoted lines
> But what I meant was, regardless of who's calling "cherry-pick", if
> "cherry-pick" runs into an error and needs to stop, it needs to save a
> state so that it can do a "--continue". And this behavior should stay
> the same regardless of who the caller is. And that means its callers
> (e.g. "rebase -i") should know about this and do a cleanup when
> "cherry-pick" failed.

The current CHERRY_PICK_HELP codepath removes CHERRY_PICK_HEAD to let its caller take care of the appropriate "commit -c" magic for historical reasons. I'd be happy to see "rebase -i" stop relying on that.

Unfortunately, outside scripts from before CHERRY_PICK_HEAD existed are also allowed to use CHERRY_PICK_HELP, so the incomplete implementation that leaves behind a CHERRY_PICK_HEAD when the commit being cherry-picked resolves into nothingness is still a bug.

Previous: Andrew WongNext: Andrew Wong
Message 17 of 22 in “Rebase regression in v1.7.9?”
  1. Felipe ContrerasJan 31, 2012
  2. Andrew WongFeb 1, 2012
  3. Felipe ContrerasFeb 1, 2012
  4. rebase -i: remove CHERRY_PICK_HEAD when cherry-pick failedAndrew Wong, Mar 18, 2012
  5. Junio C HamanoMar 19, 2012
  6. Andrew WongMar 19, 2012
  7. Andrew WongMar 24, 2012
  8. Andrew WongApr 2, 2012
  9. Junio C HamanoApr 2, 2012
  10. Junio C HamanoApr 3, 2012
  11. Ramkumar RamachandraApr 3, 2012
  12. Jonathan NiederApr 3, 2012
  13. Andrew WongApr 3, 2012
  14. Jonathan NiederApr 3, 2012
  15. Jonathan NiederApr 3, 2012
  16. Andrew WongApr 3, 2012
  17. Jonathan NiederApr 3, 2012
  18. Andrew WongApr 3, 2012
  19. Jonathan NiederApr 4, 2012
  20. Andrew WongApr 4, 2012
  21. Jonathan NiederApr 4, 2012
  22. Jonathan NiederApr 4, 2012

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.