From: Junio C Hamano <gitster@pobox.com>
To: "Samuel Čavoj" <samuel@cavoj.net>
Cc: git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH v3 2/3] sequencer: fix gpg option passed to merge subcommand
Date: Thu, 15 Oct 2020 09:47:17 -0700 [thread overview]
Message-ID: <xmqqh7qvh1wq.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201013213021.3671432-2-samuel@cavoj.net> ("Samuel =?utf-8?Q?=C4=8Cavoj=22's?= message of "Tue, 13 Oct 2020 23:30:23 +0200")
Samuel Čavoj <samuel@cavoj.net> writes:
> diff --git a/sequencer.c b/sequencer.c
> index 00acb12496..88ccff4838 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -3677,7 +3677,7 @@ static int do_merge(struct repository *r,
> strvec_push(&cmd.args, "-F");
> strvec_push(&cmd.args, git_path_merge_msg(r));
> if (opts->gpg_sign)
> - strvec_push(&cmd.args, opts->gpg_sign);
> + strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign);
Good. And later you'd add "else" to explicitly turn it off, I presume?
> diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
> index 696cb6b6a4..9d2faffa03 100755
> --- a/t/t3435-rebase-gpg-sign.sh
> +++ b/t/t3435-rebase-gpg-sign.sh
> @@ -68,4 +68,17 @@ test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' '
> test_must_fail git verify-commit HEAD
> '
>
> +test_expect_success 'rebase -r, GPG --gpg-sign and merge strategies' '
> + git reset --hard merged &&
Insert
test_unconfig commit.gpgsign &&
here. That would make it explicit that we are checking the base
case where only the command line option is given.
> + git rebase -fr --gpg-sign -s resolve --root &&
> + git verify-commit HEAD
> +'
> +
> +test_expect_success 'rebase -r, GPG config and merge strategies' '
> + git reset --hard merged &&
> + test_config commit.gpgsign true &&
Use "git config" for consistency.
> + git rebase -fr -s resolve --root &&
> + git verify-commit HEAD
> +'
> +
We'd want another one, which is to give --gpg-sign from the command
line when this is in effect:
git config commit.gpgsign false
i.e. not "test_unconfig" that removes the configuration, but
explicitly configured not to sign
Thanks.
next prev parent reply other threads:[~2020-10-15 16:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 21:30 [PATCH v3 1/3] t3435: use `test_config` instead of `git config` Samuel Čavoj
2020-10-13 21:30 ` [PATCH v3 2/3] sequencer: fix gpg option passed to merge subcommand Samuel Čavoj
2020-10-15 16:47 ` Junio C Hamano [this message]
2020-10-13 21:30 ` [PATCH v3 3/3] sequencer: pass explicit --no-gpg-sign to merge Samuel Čavoj
2020-10-15 17:02 ` Junio C Hamano
2020-10-17 22:02 ` Samuel Čavoj
2020-10-17 22:34 ` Junio C Hamano
2020-10-17 23:16 ` Samuel Čavoj
2020-10-15 16:43 ` [PATCH v3 1/3] t3435: use `test_config` instead of `git config` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh7qvh1wq.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=samuel@cavoj.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.
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 NNTP newsgroup(s).