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=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 940631F4B4 for ; Sun, 11 Oct 2020 22:51:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387768AbgJKWvF (ORCPT ); Sun, 11 Oct 2020 18:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387717AbgJKWvF (ORCPT ); Sun, 11 Oct 2020 18:51:05 -0400 X-Greylist: delayed 156 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 11 Oct 2020 15:51:04 PDT Received: from mail.sammserver.com (sammserver.com [IPv6:2001:470:5a5b:1::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE753C0613CE for ; Sun, 11 Oct 2020 15:51:04 -0700 (PDT) Received: by mail.sammserver.com (Postfix, from userid 5011) id A51D3110018B; Mon, 12 Oct 2020 00:48:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cavoj.net; s=email; t=1602456505; bh=R1s2yEnsnXCIUip44XBtzDGha1jpIX2Wiah+0IxuPx8=; h=From:To:Cc:Subject:Date:From; b=RWjFkT9CBQk+ForcNsKhZS92fw28sIaey1pWdLJdFD51dVENKyYbsOkb6Y0Cd7FE8 9v8xFPuU/n0DIi7mPqDzFBAdolI+iQGRT4mGiauh0fT1RFBjPfsxJ/4t41VQeKOrQ8 3z1BvQ+An1Ra3Xrbiy9pE7UWxnNFoWxzThTeTKu8= Received: from fastboi.localdomain (fastboi.wg [10.32.40.5]) by mail.sammserver.com (Postfix) with ESMTP id 5BF1C1100188; Mon, 12 Oct 2020 00:48:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cavoj.net; s=email; t=1602456505; bh=R1s2yEnsnXCIUip44XBtzDGha1jpIX2Wiah+0IxuPx8=; h=From:To:Cc:Subject:Date:From; b=RWjFkT9CBQk+ForcNsKhZS92fw28sIaey1pWdLJdFD51dVENKyYbsOkb6Y0Cd7FE8 9v8xFPuU/n0DIi7mPqDzFBAdolI+iQGRT4mGiauh0fT1RFBjPfsxJ/4t41VQeKOrQ8 3z1BvQ+An1Ra3Xrbiy9pE7UWxnNFoWxzThTeTKu8= Received: by fastboi.localdomain (Postfix, from userid 1000) id 431CB1420A8F; Mon, 12 Oct 2020 00:48:25 +0200 (CEST) From: =?UTF-8?q?Samuel=20=C4=8Cavoj?= To: git@vger.kernel.org, Junio C Hamano Cc: Johannes Schindelin , Jeff King , =?UTF-8?q?Samuel=20=C4=8Cavoj?= Subject: [PATCH] sequencer: fix gpg option passed to octopus merge Date: Mon, 12 Oct 2020 00:48:04 +0200 Message-Id: <20201011224804.722607-1-samuel@cavoj.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- 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) -- 2.28.0