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
AWAndrew Wong <andrew.w@sohovfx.com>
Date
Apr 3, 2012, 21:22 UTC
Message-ID
<4F7B69FE.9010600@sohovfx.com>
In-Reply-To
<20120403211219.GC19858@burratino>
On 04/03/2012 05:12 PM, Jonathan Nieder wrote:
Show 9 quoted lines
> Jonathan Nieder wrote:
>   
>> Cherry-pick does the merge, so it is what notices the merge conflict.
>> If you search for CHERRY_PICK_HELP in builtin/revert.c, the relevant
>> code should show up.
>>     
> I was looking at an older git version.  In newer gits, the code path
> in question lives at print_advice() in sequencer.c.
>   
Yes, the code has been moved into sequencer now.

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.

Previous: Jonathan NiederNext: Jonathan Nieder
Message 16 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.