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

Re: [PATCH 2/2] sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 15, 2024, 17:36 UTC
Message-ID
<xmqq8r3lsk87.fsf@gitster.g>
In-Reply-To
<76c62133-30e4-4145-99ea-aeef644d617a@oracle.com>
Vegard Nossum <vegard.nossum@oracle.com> writes:
Show 14 quoted lines
> On 11/02/2024 18:05, Junio C Hamano wrote:
>> Phillip Wood <phillip.wood123@gmail.com> writes:
>>> On 08/02/2024 17:20, Junio C Hamano wrote:
>>>> Phillip Wood <phillip.wood123@gmail.com> writes:
>>> It might be worth explaining why this happens
>>>
>>> This is because rebase sets the GIT_CHERRY_PICK_HELP environment
>>> variable to customize the advice given to users when there are
>>> conflicts which causes the sequencer to remove CHERRY_PICK_HEAD.
>> True.  I'd prefer to see the original submitter assemble the pieces
>> and come up with the final version, rather than me doing so.
>
> Thanks for explaining and sorry for the delay. I saw the patch was
> merged to main now, but I will keep this in mind for next time.

Thanks for finding and fixing. Hope we'll see more of your contributions in the future.

Previous: Vegard Nossum
Message 16 of 16 in “t/t3515-cherry-pick-rebase.sh: new testcase demonstrating broken behavior”
  1. t/t3515-cherry-pick-rebase.sh: new testcase demonstrating broken behaviorVegard Nossum, Feb 2, 2024
  2. Phillip WoodFeb 4, 2024
  3. 2/2 sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commandsVegard Nossum, Feb 5, 2024
  4. Kristoffer HaugsbakkFeb 5, 2024
  5. Junio C HamanoFeb 5, 2024
  6. Vegard NossumFeb 5, 2024
  7. Junio C HamanoFeb 6, 2024
  8. Phillip WoodFeb 7, 2024
  9. Junio C HamanoFeb 7, 2024
  10. Vegard NossumFeb 8, 2024
  11. Phillip WoodFeb 8, 2024
  12. Junio C HamanoFeb 8, 2024
  13. Phillip WoodFeb 11, 2024
  14. Junio C HamanoFeb 11, 2024
  15. Vegard NossumFeb 15, 2024
  16. Junio C HamanoFeb 15, 2024

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.