From: Junio C Hamano <firstname.lastname@example.org> To: Phillip Wood <email@example.com> Cc: "ZheNing Hu" <firstname.lastname@example.org>, "ZheNing Hu via GitGitGadget" <email@example.com>, "Git List" <firstname.lastname@example.org>, "Christian Couder" <email@example.com>, "Hariom Verma" <firstname.lastname@example.org>, "Ævar Arnfjörð Bjarmason" <email@example.com>, "Han-Wen Nienhuys" <firstname.lastname@example.org>, "Ramkumar Ramachandra" <email@example.com>, "Felipe Contreras" <firstname.lastname@example.org> Subject: Re: [PATCH v2 1/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP Date: Wed, 04 Aug 2021 10:31:20 -0700 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <firstname.lastname@example.org> (Phillip Wood's message of "Wed, 4 Aug 2021 11:10:11 +0100") Phillip Wood <email@example.com> writes: >> You mean that cherry_pick with GIT_CHERRY_PICK_HELP suppresses >> CHERRY_PICK_HEAD is not even a bug? I think that it is what the existing test is telling us. Of course, with a good reason, an earlier design can be updated as long as we make sure we won't hurt existing users who may rely on the current design, but ... > Looking at the history I think it is fair to conclude that > GIT_CHERRY_PICK_HELP was introduced as a way to help people writing > scripts built on top of 'git cherry-pick' like 'git rebase' that want > to have a custom message and do not want to leave CHERRY_PICK_HEAD > around if there are conflicts. I don't think it was intended as a way > for users to change the help when cherry-picking and has never been > documented as such. I think we'd be better to focus on improving the > default help that cherry-pick prints as the second patch in this > series does. ... I think that is a reasonable stance to take [*1*]. If the default help message can be improved, that is a good thing to do regardless. Thanks. [Footnote] *1* Tying the "here is a custom HELP text" environment variable to "having a customization means whoever is driving the cherry-pick machinery is ALSO responsible for sequencing and we will remove CHERRY_PICK_HEAD" is a rather unfortunate design, but as long as that is documented, it is a workable design.
next prev parent reply other threads:[~2021-08-04 17:31 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-31 7:01 [PATCH 0/2] " 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 2021-07-31 7:01 ` [PATCH 2/2] [GSOC] cherry-pick: use better advice message ZheNing Hu via GitGitGadget 2021-08-01 10:14 ` Phillip Wood 2021-08-02 13:35 ` ZheNing Hu 2021-08-03 1:16 ` [PATCH v2 0/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP ZheNing Hu via GitGitGadget 2021-08-03 1:16 ` [PATCH v2 1/2] " ZheNing Hu via GitGitGadget 2021-08-03 22:36 ` Junio C Hamano 2021-08-04 8:35 ` ZheNing Hu 2021-08-04 10:10 ` Phillip Wood 2021-08-04 17:31 ` Junio C Hamano [this message] 2021-08-05 5:36 ` ZheNing Hu 2021-08-03 1:16 ` [PATCH v2 2/2] [GSOC] cherry-pick: use better advice message ZheNing Hu via GitGitGadget 2021-08-05 5:48 ` [PATCH v3] " ZheNing Hu via GitGitGadget 2021-08-11 10:00 ` Phillip Wood 2021-08-13 8:08 ` ZheNing Hu 2021-08-13 20:14 ` Junio C Hamano 2021-08-14 2:07 ` ZheNing Hu 2021-08-17 10:09 ` Phillip Wood 2021-08-14 10:27 ` [PATCH v4] " ZheNing Hu via GitGitGadget 2021-08-14 20:32 ` Junio C Hamano 2021-08-15 12:48 ` ZheNing Hu 2021-08-16 0:55 ` [PATCH v5] " ZheNing Hu via GitGitGadget 2021-08-18 9:51 ` Phillip Wood 2021-08-19 1:55 ` ZheNing Hu 2021-08-19 2:07 ` ZheNing Hu 2021-08-19 5:51 ` [PATCH v6] " ZheNing Hu via GitGitGadget 2021-08-19 17:10 ` Junio C Hamano 2021-08-21 1:40 ` ZheNing Hu 2021-08-22 13:08 ` [PATCH v7] " ZheNing Hu via GitGitGadget
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 \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH v2 1/2] [GSOC] cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP' \ /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
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.