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
Mar 19, 2012, 21:00 UTC
Message-ID
<4F679E67.4080708@sohovfx.com>
In-Reply-To
<7vk42gbkl1.fsf@alter.siamese.dyndns.org>
On 03/19/2012 12:51 PM, Junio C Hamano wrote:
> Isn't the real solution *not* to create the CHERRY_PICK_HEAD in the
> sequencer when it is not know if it is needed, instead of the current code
> which seems to create first and then selectively try to unlink() it?
>

I do agree that it's not pretty to create the file, then quickly delete it. I did consider putting a condition around the code that creates CHERRY_PICK_HEAD and REVERT_HEAD.

A possible condition would be checking the env var GIT_CHERRY_PICK_HELP, which is only set if 'cherry-pick' is called under 'rebase -i'. I never liked how we're passing in a help message using an env var, so I don't feel like introducing another dependency on this env var is a good idea.

Another possible condition would be to add another flag to "cherry-pick". But a proper implementation would not only involve adding code to parse the flag in 'cherry-pick', but also adding code to save/restore the option in sequencer, even though 'rebase -i' only need it for single_pick. It's not that adding these codes are difficult, but it seems like we're adding a lot of code just to add a behavior that only 'rebase -i' needs.

Though if the additional flag in "cherry-pick" and additional option in sequencer could be useful elsewhere, I could do it that way too.

Previous: Junio C HamanoNext: Andrew Wong
Message 6 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.