All of
 help / color / mirror / Atom feed
From: ZheNing Hu <>
To: Junio C Hamano <>
Cc: "ZheNing Hu via GitGitGadget" <>,
	"Git List" <>,
	"Christian Couder" <>,
	"Hariom Verma" <>,
	"Ævar Arnfjörð Bjarmason" <>,
	"Han-Wen Nienhuys" <>,
	"Ramkumar Ramachandra" <>,
	"Felipe Contreras" <>,
	"Phillip Wood" <>
Subject: Re: [PATCH 1/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP
Date: Fri, 30 Jul 2021 22:15:36 +0800	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <xmqqzgu43kkz.fsf@gitster.g>

Junio C Hamano <> 于2021年7月30日周五 上午4:56写道:
> The patch is a bit hard to read, but I do not think this improves
> the root cause of the issue at all, which is that "do we need to
> delete the pseudoref?" decision is tied to and based on the presense
> of the custom message in the environment variable.

My original idea was to distinguish between cherry-pick calls by machines
( and cherry-pick calls by people through
an additional option "rebase-preserve-merges-mode".

> The original issue was that we declared (erroneously) that the
> presence of a custom message _means_ the caller is not a human but a
> sequencing machinery that wants to deal with what is done via the
> CHERRY_PICK_HEAD pseudoref itself, and your original issue was that
> when a human user has the custom message envirnoment (either on
> purpose or by mistake), the logic _misidentifies_ the call as if it
> is made from a sequencing machinery and we lose the CHERRY_PICK_HEAD
> pseudoref.  The root cause is mistaking the correlation (sequencing
> machinery uses the environment and it also does not want pseudoref)
> as the causation (presense of the environment means we should remove
> pseudoref).

Ok... Now I guess what you mean is to provide an option for git cherry-pick
to specifically delete "CHERRY_PICK_HEAD", and this options is "hidden",
it is not provided to users, it is only reserved for sequencing
machinery. In this
way, we separate print_advice() from deleting "CHERRY_PICK_HEAD".
Then in the future, GIT_CHERRY_PICK_HELP will be deleted.

ZheNing Hu

  reply	other threads:[~2021-07-30 14:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-29 12:27 [PATCH 0/2] " ZheNing Hu via GitGitGadget
2021-07-29 12:27 ` [PATCH 1/2] " ZheNing Hu via GitGitGadget
2021-07-29 20:56   ` Junio C Hamano
2021-07-30 14:15     ` ZheNing Hu [this message]
2021-07-29 12:27 ` [PATCH 2/2] [GSOC] cherry-pick: use better advice message ZheNing Hu via GitGitGadget
2021-07-31  7:01 [PATCH 0/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP ZheNing Hu via GitGitGadget
2021-07-31  7:01 ` [PATCH 1/2] " ZheNing Hu via GitGitGadget
2021-08-01 10:09   ` Phillip Wood
2021-08-02 13:34     ` ZheNing Hu

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:

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

  git send-email \
    --in-reply-to='' \ \ \ \ \ \ \ \ \ \ \ \
    --subject='Re: [PATCH 1/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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.