diff options
| author | Vegard Nossum <vegard.nossum@oracle.com> | 2024-02-02 09:18:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 17:17:55 (GMT) |
| commit | e4301f73fffacf2ba9fb2042b95de32880381e72 (patch) | |
| tree | a5ba75a715b8660f2412088f8d9ddc8be555a2f8 | |
| parent | 564d0252ca632e0264ed670534a51d18a689ef5d (diff) | |
| download | git-e4301f73fffacf2ba9fb2042b95de32880381e72.zip git-e4301f73fffacf2ba9fb2042b95de32880381e72.tar.gz git-e4301f73fffacf2ba9fb2042b95de32880381e72.tar.bz2 | |
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>
| -rw-r--r-- | sequencer.c | 1 | ||||
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index d584cac..ed30cea 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 */ diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index c5f3055..84a92d6 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -153,6 +153,18 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' ' git rebase --continue ' +test_expect_success 'cherry-pick works with rebase --exec' ' + test_when_finished "git cherry-pick --abort; \ + git rebase --abort; \ + git checkout primary" && + echo "exec git cherry-pick G" >todo && + ( + set_replace_editor todo && + test_must_fail git rebase -i D D + ) && + test_cmp_rev G CHERRY_PICK_HEAD +' + test_expect_success 'rebase -x with empty command fails' ' test_when_finished "git rebase --abort ||:" && test_must_fail env git rebase -x "" @ 2>actual && |