From cf0ad4d199924073ef485ff60393c8a81edbdbb6 Mon Sep 17 00:00:00 2001 From: Đoàn Trần Công Danh Date: Fri, 3 Apr 2020 17:28:03 +0700 Subject: cherry-pick/revert: honour --no-gpg-sign in all case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit {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 Signed-off-by: Junio C Hamano --- sequencer.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sequencer.c') 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)) -- cgit v1.3