All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Vegard Nossum <vegard.nossum@oracle.com>
Cc: Phillip Wood <phillip.wood123@gmail.com>,
	 Kristoffer Haugsbakk <code@khaugsbakk.name>,
	 git@vger.kernel.org,  Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 2/2] sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands
Date: Thu, 15 Feb 2024 09:36:24 -0800	[thread overview]
Message-ID: <xmqq8r3lsk87.fsf@gitster.g> (raw)
In-Reply-To: <76c62133-30e4-4145-99ea-aeef644d617a@oracle.com> (Vegard Nossum's message of "Thu, 15 Feb 2024 15:24:53 +0100")

Vegard Nossum <vegard.nossum@oracle.com> writes:

> 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.


      reply	other threads:[~2024-02-15 17:36 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-02  9:18 [PATCH] t/t3515-cherry-pick-rebase.sh: new testcase demonstrating broken behavior Vegard Nossum
2024-02-04 11:14 ` Phillip Wood
2024-02-05 14:13   ` [PATCH 2/2] sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands Vegard Nossum
2024-02-05 14:38     ` Kristoffer Haugsbakk
2024-02-05 23:09       ` Junio C Hamano
2024-02-05 23:14         ` Vegard Nossum
2024-02-06  3:54           ` Junio C Hamano
2024-02-07 14:03             ` Phillip Wood
2024-02-07 16:39               ` Junio C Hamano
2024-02-08  8:48                 ` Vegard Nossum
2024-02-08 14:26                   ` Phillip Wood
2024-02-08 17:20                     ` Junio C Hamano
2024-02-11 11:11                       ` Phillip Wood
2024-02-11 17:05                         ` Junio C Hamano
2024-02-15 14:24                           ` Vegard Nossum
2024-02-15 17:36                             ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq8r3lsk87.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=code@khaugsbakk.name \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=phillip.wood123@gmail.com \
    --cc=vegard.nossum@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.