From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Samuel Čavoj" <samuel@cavoj.net>,
git@vger.kernel.org, "Jeff King" <peff@peff.net>
Subject: Re: [PATCH] sequencer: fix gpg option passed to octopus merge
Date: Mon, 12 Oct 2020 20:26:57 +0100 [thread overview]
Message-ID: <865afe23-3e83-59a0-76ce-fee91f3fb554@gmail.com> (raw)
In-Reply-To: <xmqq5z7fqt6k.fsf@gitster.c.googlers.com>
On 12/10/2020 17:56, Junio C Hamano wrote:
> Phillip Wood <phillip.wood123@gmail.com> writes:
>
>> In run_git_commit() we do
>>
>> if (opts->gpg_sign)
>> strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign);
>> else
>> strvec_push(&cmd.args, "--no-gpg-sign");
>>
>> I'm not immediately clear why we pass --no-gpg-sign when
>> opts->gpg_sign isn't set ...
>
> Isn't it because there is a configuration that the &cmd may honor
> that forces gpg signing all the time?
Yes you're right, so we should be passing --no-gpg-sign here if
opts->gpg_sign == NULL, otherwise `git merge` will still sign commits
when it is run by `git rebase --no-gpg-sign`
Best Wishes
Phillip
>
>> but it makes me wonder if we should be doing
>> that here as well
>
> Possibly.
>
next prev parent reply other threads:[~2020-10-12 19:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-11 22:48 [PATCH] sequencer: fix gpg option passed to octopus merge Samuel Čavoj
2020-10-11 22:58 ` brian m. carlson
2020-10-12 10:34 ` Johannes Schindelin
2020-10-12 13:15 ` Phillip Wood
2020-10-12 16:56 ` Junio C Hamano
2020-10-12 19:26 ` Phillip Wood [this message]
2020-10-12 19:41 ` Junio C Hamano
2020-10-12 20:11 ` Junio C Hamano
2020-10-12 19:47 ` Junio C Hamano
2020-10-12 20:55 ` Johannes Schindelin
2020-10-13 4:45 ` 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=865afe23-3e83-59a0-76ce-fee91f3fb554@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--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).