Hi ZheNing
On 28/07/2021 08:39, ZheNing Hu wrote:
Phillip Wood <phillip.wood123@xxxxxxxxx> 于2021年7月28日周三 上午3:43写道：
diff --git a/builtin/revert.c b/builtin/revert.c
index 237f2f18d4c..ec0abe7db73 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -245,6 +245,7 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
opts.action = REPLAY_PICK;
sequencer_init_config(&opts);
+ unsetenv("GIT_CHERRY_PICK_HELP");
This will break git-rebase--preserve-merges.sh which uses
GIT_CHERRY_PICK_HELP to set the help and ensure CHERRY_PICK_HEAD is
removed when picking commits. I'm a bit confused as to what the problem
Yeah, I thought it would call some rebase-related code before, I
didn’t expect it to
call cherry-pick. On the other hand, I passed all tests, so I ignore
it, there should be
a test for it.
is - how is 'git cherry-pick' being run with GIT_CHERRY_PICK_HELP set in
the environment outside of a rebase (your explanation in [1] does not
mention how GIT_CHERRY_PICK_HELP is set)? As far as I can see 'git
rebase -i' does not set it so the only case I can think of is
cherry-picking from an exec command while running 'git rebase -p'
Ah, because I want to find a way to suppress its advice messages about
"git commit",
and I don’t think anyone else is using this "feature".
I'd welcome a patch to improve the advice. I suspect the current advice
predates the introduction of the '--continue' flag for cherry-pick. I
think that would be a better route forward as it would benefit all
users. Setting GIT_CHERRY_PICK_HELP is undocumented and has always
removed CHERRY_PICK_HEAD since CHERRY_PICK_HEAD was introduced in commit
7e5c0cbf (Introduce CHERRY_PICK_HEAD, 2011-02-19).
Best Wishes
Phillip
Best Wishes
Phillip
[1]
https://lore.kernel.org/git/CAOLTT8Ty47fyY7T3d68CYPKh9k+HAHsnCLJ=F0KaLm+0gp3+EQ@xxxxxxxxxxxxxx/
Thanks.
--
ZheNing Hu
