Re: [PATCH] sequencer: fix gpg option passed to octopus merge

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Oct 12, 2020, 19:26 UTC
Message-ID: <865afe23-3e83-59a0-76ce-fee91f3fb554@gmail.com>
In-Reply-To: <xmqq5z7fqt6k.fsf@gitster.c.googlers.com>

On 12/10/2020 17:56, Junio C Hamano wrote:

Show 14 quoted lines

> 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

Show 6 quoted lines

> 
>> but it makes me wonder if we should be doing
>> that here as well
> 
> Possibly.
>