diff options
author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2020-04-03 13:28:03 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-03 21:37:22 +0300 |
commit | cf0ad4d199924073ef485ff60393c8a81edbdbb6 (patch) | |
tree | e83494ce54d58384b901d304c1c1dfc95015e925 /sequencer.c | |
parent | c241371c0445cee7116e36bbacb5b35069a81e64 (diff) |
cherry-pick/revert: honour --no-gpg-sign in all case
{cherry-pick,revert} --edit hasn't honoured --no-gpg-sign yet.
Pass this option down to git-commit to honour it.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
-rw-r--r-- | sequencer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index e528225e78..6e6e98a0f8 100644 --- a/sequencer.c +++ b/sequencer.c @@ -946,6 +946,8 @@ static int run_git_commit(struct repository *r, argv_array_push(&cmd.args, "--amend"); if (opts->gpg_sign) argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign); + else + argv_array_push(&cmd.args, "--no-gpg-sign"); if (defmsg) argv_array_pushl(&cmd.args, "-F", defmsg, NULL); else if (!(flags & EDIT_MSG)) |