From: Junio C Hamano <gitster@pobox.com>
To: "Samuel Čavoj" <samuel@cavoj.net>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH] sequencer: fix gpg option passed to octopus merge
Date: Mon, 12 Oct 2020 12:47:02 -0700 [thread overview]
Message-ID: <xmqqy2kbns5l.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201011224804.722607-1-samuel@cavoj.net> ("Samuel Čavoj"'s message of "Mon, 12 Oct 2020 00:48:04 +0200")
Samuel Čavoj <samuel@cavoj.net> writes:
> Subject: Re: [PATCH] sequencer: fix gpg option passed to octopus merge
Puzzling. Why do you single out octopus merge like this?
sequencer.c::do_merge() is called from pick_commits() whenever we
see a "merge" insn, and not limited to an octopus merge.
Can we have a test to demonstrate the existing failure, so that we
can notice if this fix is broken in the future?
> When performing octopus merges with interactive rebase with gpgsign
> enabled (either using rebase -S or config commit.gpgsign), the operation
> would fail on the merge. Instead of "-S%s" with the key id substituted,
> only the bare key id would get passed to the underlying merge command,
> which tried to interpret it as a ref.
>
> Signed-off-by: Samuel Čavoj <samuel@cavoj.net>
> ---
> It is unclear to me whether I should have based this off of maint or
> master, master made more sense to me. I apologize if maint was the
> correct one, please tell and I will resubmit.
> ---
> sequencer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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);
>
> /* Add the tips to be merged */
> for (j = to_merge; j; j = j->next)
next prev parent reply other threads:[~2020-10-12 19:47 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
2020-10-12 19:41 ` Junio C Hamano
2020-10-12 20:11 ` Junio C Hamano
2020-10-12 19:47 ` Junio C Hamano [this message]
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=xmqqy2kbns5l.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--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.
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).