diff options
| author | Vegard Nossum <vegard.nossum@oracle.com> | 2024-02-02 10:18:50 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 09:17:55 -0800 |
| commit | e4301f73fffacf2ba9fb2042b95de32880381e72 (patch) | |
| tree | a5ba75a715b8660f2412088f8d9ddc8be555a2f8 /sequencer.c | |
| parent | 564d0252ca632e0264ed670534a51d18a689ef5d (diff) | |
| download | git-e4301f73fffacf2ba9fb2042b95de32880381e72.tar.xz | |
sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands
Running "git cherry-pick" as an x-command in the rebase plan loses
the original authorship information.
To fix this, unset GIT_CHERRY_PICK_HELP for 'exec' commands.
Helped-by: Phillip Wood <phillip.wood123@gmail.com>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index d584cac8ed..ed30ceaf8b 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3647,6 +3647,7 @@ static int do_exec(struct repository *r, const char *command_line) fprintf(stderr, _("Executing: %s\n"), command_line); cmd.use_shell = 1; strvec_push(&cmd.args, command_line); + strvec_push(&cmd.env, "GIT_CHERRY_PICK_HELP"); status = run_command(&cmd); /* force re-reading of the cache */ |