From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 40D371F4B4 for ; Mon, 12 Oct 2020 23:52:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730243AbgJLXwg (ORCPT ); Mon, 12 Oct 2020 19:52:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728821AbgJLXwg (ORCPT ); Mon, 12 Oct 2020 19:52:36 -0400 Received: from mail.sammserver.com (sammserver.com [IPv6:2001:470:5a5b:1::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2036C0613D0 for ; Mon, 12 Oct 2020 16:52:35 -0700 (PDT) Received: by mail.sammserver.com (Postfix, from userid 5011) id 634E71105882; Tue, 13 Oct 2020 01:52:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cavoj.net; s=email; t=1602546754; bh=95cTR0CruAOlkit3nmqsvLS2MlFeEK4RuYTbCTQK8mY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UYQyCGloba61JkuaPvKc+xx7CgStnvSYVdybnKjLwsdYJ7DvjUjvd0OGjPuIoHWhj czwFTLghUgZCA5TlYK6l5+r45xrhalEwm5tH0QwpqqXSGOYtLcD3WHiEoBu9UPbLI/ YX5XJPyUkl9dTAz1e0iENqswJjC9pswlkS6Hl1Zs= Received: from fastboi.localdomain (fastboi.wg [10.32.40.5]) by mail.sammserver.com (Postfix) with ESMTP id 2AC6E110587F; Tue, 13 Oct 2020 01:52:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cavoj.net; s=email; t=1602546754; bh=95cTR0CruAOlkit3nmqsvLS2MlFeEK4RuYTbCTQK8mY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UYQyCGloba61JkuaPvKc+xx7CgStnvSYVdybnKjLwsdYJ7DvjUjvd0OGjPuIoHWhj czwFTLghUgZCA5TlYK6l5+r45xrhalEwm5tH0QwpqqXSGOYtLcD3WHiEoBu9UPbLI/ YX5XJPyUkl9dTAz1e0iENqswJjC9pswlkS6Hl1Zs= Received: by fastboi.localdomain (Postfix, from userid 1000) id 1B2421420A8F; Tue, 13 Oct 2020 01:52:34 +0200 (CEST) Date: Tue, 13 Oct 2020 01:52:34 +0200 From: Samuel =?utf-8?B?xIxhdm9q?= To: git@vger.kernel.org, Junio C Hamano Cc: Phillip Wood , "brian m. carlson" , Johannes Schindelin Subject: Re: [PATCH v2 1/2] sequencer: fix gpg option passed to merge subcommand Message-ID: <20201012235234.mj7ejpmnbkfshte6@fastboi.localdomain> References: <20201012234901.1356948-1-samuel@cavoj.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201012234901.1356948-1-samuel@cavoj.net> Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 13.10.2020 01:49, Samuel Čavoj wrote: > From: Johannes Schindelin Oh boy, I left in a line by accident. Please remove this before applying, unless a v3 comes around. Sorry about that. > > When performing a rebase with --rebase-merges using either a custom > strategy specified with -s or an octopus merge, and at the same time > having gpgsign enabled (either rebase -S or config commit.gpgsign), the > operation would fail on making the merge commit. 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. > > Fix the issue and add a test case as suggested by Johannes Schindelin. > > Signed-off-by: Samuel Čavoj > --- > changed v1 -> v2: > added test case > --- > sequencer.c | 2 +- > t/t3435-rebase-gpg-sign.sh | 6 ++++++ > 2 files changed, 7 insertions(+), 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) > diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh > index b47c59c190..f70b280f5c 100755 > --- a/t/t3435-rebase-gpg-sign.sh > +++ b/t/t3435-rebase-gpg-sign.sh > @@ -68,4 +68,10 @@ test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' ' > test_must_fail git verify-commit HEAD > ' > > +test_expect_success 'rebase -r, GPG and merge strategies' ' > + git reset --hard merged && > + git rebase -fr --gpg-sign -s resolve --root && > + git verify-commit HEAD > +' > + > test_done > -- > 2.28.0 >