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-lists@sohovfx.com>
Date
Mar 24, 2012, 20:03 UTC
Message-ID
<4F6E289B.4020104@sohovfx.com>
In-Reply-To
<4F679E67.4080708@sohovfx.com>
On 12-03-19 5:00 PM, Andrew Wong wrote:
Show 7 quoted lines
> 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?
>>
> Though if the additional flag in "cherry-pick" and additional option in
> sequencer could be useful elsewhere, I could do it that way too.

I looked into adding a "no-state" flag in 'cherry-pick' to not create the CHERRY_PICK_HEAD, but 'commit' actually has several dependencies on CHERRY_PICK_HEAD, such as recording reflog message, 'prepare-commit-msg' hook, and formatting a user message. So if we want to continue to pursue this path, we'd have to preserve those behaviors in 'commit' as well. It's probably not a good idea to make all these changes in 'cherry-pick' and 'commit' just to avoid a simple cleanup in 'rebase -i'. So I still prefer the patch I submitted earlier.

Previous: Andrew WongNext: Andrew Wong
Message 7 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.