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 8C14C1F4B4 for ; Mon, 12 Oct 2020 23:49:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389532AbgJLXtJ (ORCPT ); Mon, 12 Oct 2020 19:49:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389460AbgJLXtI (ORCPT ); Mon, 12 Oct 2020 19:49:08 -0400 Received: from mail.sammserver.com (sammserver.com [IPv6:2001:470:5a5b:1::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FC4BC0613D1 for ; Mon, 12 Oct 2020 16:49:08 -0700 (PDT) Received: by mail.sammserver.com (Postfix, from userid 5011) id 214FB110583C; Tue, 13 Oct 2020 01:49:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cavoj.net; s=email; t=1602546546; bh=kLEXT3KXiLM2rb9NTyPvLjz7LiWHDW+0asHyeqak6rY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DvIjJPIo8sOd3RR4X2YszF8j0yx3qyb0kn33YqoiXdjL6iphzkk4WftzJ1nuhoLFh oSzfA/t/TfIIh+FpfoGGkc9DT7+lAO/aJCW1hHqbSHBuhFR6i7imytgjvb1yi8c/03 +P2PNSzJj8YjqLWrVh1hgNjGYdipwZfk7se9pcr8= Received: from fastboi.localdomain (fastboi.wg [10.32.40.5]) by mail.sammserver.com (Postfix) with ESMTP id EB2C21105838; Tue, 13 Oct 2020 01:49:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cavoj.net; s=email; t=1602546546; bh=kLEXT3KXiLM2rb9NTyPvLjz7LiWHDW+0asHyeqak6rY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DvIjJPIo8sOd3RR4X2YszF8j0yx3qyb0kn33YqoiXdjL6iphzkk4WftzJ1nuhoLFh oSzfA/t/TfIIh+FpfoGGkc9DT7+lAO/aJCW1hHqbSHBuhFR6i7imytgjvb1yi8c/03 +P2PNSzJj8YjqLWrVh1hgNjGYdipwZfk7se9pcr8= Received: by fastboi.localdomain (Postfix, from userid 1000) id D5EB314200ED; Tue, 13 Oct 2020 01:49:05 +0200 (CEST) From: =?UTF-8?q?Samuel=20=C4=8Cavoj?= To: git@vger.kernel.org, Junio C Hamano Cc: Phillip Wood , "brian m. carlson" , Johannes Schindelin , =?UTF-8?q?Samuel=20=C4=8Cavoj?= Subject: [PATCH v2 2/2] sequencer: pass explicit --no-gpg-sign to merge Date: Tue, 13 Oct 2020 01:49:01 +0200 Message-Id: <20201012234901.1356948-2-samuel@cavoj.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012234901.1356948-1-samuel@cavoj.net> References: <20201012234901.1356948-1-samuel@cavoj.net> 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 The merge subcommand launched for merges with non-default strategy would use its own default behaviour to decide how to sign commits, regardless of what opts->gpg_sign was set to. For example the --no-gpg-sign flag given to rebase explicitly would get ignored, if commit.gpgsign was set to true. Signed-off-by: Samuel Čavoj --- sequencer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sequencer.c b/sequencer.c index 88ccff4838..043d606829 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3678,6 +3678,8 @@ static int do_merge(struct repository *r, strvec_push(&cmd.args, git_path_merge_msg(r)); if (opts->gpg_sign) strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign); + else + strvec_push(&cmd.args, "--no-gpg-sign"); /* Add the tips to be merged */ for (j = to_merge; j; j = j->next) -- 2.28.0