From: Junio C Hamano <gitster@pobox.com>
To: "Samuel Čavoj" <samuel@cavoj.net>
Cc: git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2 2/2] sequencer: pass explicit --no-gpg-sign to merge
Date: Mon, 12 Oct 2020 21:46:51 -0700 [thread overview]
Message-ID: <xmqqwnzulolg.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201012234901.1356948-2-samuel@cavoj.net> ("Samuel Čavoj"'s message of "Tue, 13 Oct 2020 01:49:01 +0200")
Samuel Čavoj <samuel@cavoj.net> writes:
> The merge subcommand launched for merges with non-default strategy would
> use its own default behaviour to decide how to sign commits, regardless
> of what opts->gpg_sign was set to. For example the --no-gpg-sign flag
> given to rebase explicitly would get ignored, if commit.gpgsign was set
> to true.
>
> Signed-off-by: Samuel Čavoj <samuel@cavoj.net>
> ---
> sequencer.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/sequencer.c b/sequencer.c
> index 88ccff4838..043d606829 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -3678,6 +3678,8 @@ static int do_merge(struct repository *r,
> strvec_push(&cmd.args, git_path_merge_msg(r));
> if (opts->gpg_sign)
> strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign);
> + else
> + strvec_push(&cmd.args, "--no-gpg-sign");
>
> /* Add the tips to be merged */
> for (j = to_merge; j; j = j->next)
A test that passes --no-gpg-sign from the command line (because
commit.gpgsign is set in the repository used in these tests) would
be a good thing to have, next to the test you added in [PATCH 1/2].
You'd want to make sure the command line overrides the configured
default by checking that the resulting history are not signed.
Thanks.
next prev parent reply other threads:[~2020-10-13 4:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 23:49 [PATCH v2 1/2] sequencer: fix gpg option passed to merge subcommand Samuel Čavoj
2020-10-12 23:49 ` [PATCH v2 2/2] sequencer: pass explicit --no-gpg-sign to merge Samuel Čavoj
2020-10-13 4:46 ` Junio C Hamano [this message]
2020-10-13 10:03 ` Phillip Wood
2020-10-12 23:52 ` [PATCH v2 1/2] sequencer: fix gpg option passed to merge subcommand Samuel Čavoj
2020-10-13 9:55 ` Phillip Wood
2020-10-13 10:43 ` Samuel Čavoj
2020-10-13 13:15 ` Phillip Wood
2020-10-13 10:02 ` Phillip Wood
2020-10-13 10:51 ` Samuel Čavoj
2020-10-13 13:28 ` Phillip Wood
2020-10-13 22:06 ` Junio C Hamano
2020-10-13 23:45 ` Samuel Čavoj
2020-10-14 15:31 ` Junio C Hamano
2020-10-16 13:40 ` Phillip Wood
2020-10-16 16:37 ` Junio C Hamano
2020-10-16 17:25 ` Phillip Wood
2020-10-16 20:15 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwnzulolg.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=samuel@cavoj.net \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).