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 4259A1F4B4 for ; Mon, 12 Oct 2020 19:41:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387594AbgJLTlz (ORCPT ); Mon, 12 Oct 2020 15:41:55 -0400 Received: from pb-smtp2.pobox.com ([64.147.108.71]:61133 "EHLO pb-smtp2.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730888AbgJLTlz (ORCPT ); Mon, 12 Oct 2020 15:41:55 -0400 Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 06EB968954; Mon, 12 Oct 2020 15:41:53 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=1vH6PLXk1Jyke+BfgFaKFFPNM7k=; b=mr9OSL ge6h2SDHNux2XnwnrA9MiqkmnVp6vX/L5qZ05aqT5LnXINp5fMmnVgh/qadDAE4Q JZG95Un5RUBYh0T291r6mU7cdKsbf67pP0dFd4SjkjzYuXAKZ/ULsulYmMew5zlT d/5r1r2AUxBtz+KeiuEA0/DHfViBDvRmTRYA4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=UnKAXse3xNYkJsdMBf5YMtxzdrq04NgP SzvQsxm6MkfNtgKXC1JgheH7KMuQ6oXXN4J4/jKSDO/o9l9l2vv3gkZsgqUqnBh3 2MVYeffNxYF9Bq7GG5Qadz+s5OHlJ9X8dxtScAGByCxIC19LXeE9s9vPsyevNgfM 4elBt/8Ilro= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id F266A68953; Mon, 12 Oct 2020 15:41:52 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.74.119.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 8273768952; Mon, 12 Oct 2020 15:41:52 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Phillip Wood Cc: Johannes Schindelin , "brian m. carlson" , Samuel =?utf-8?Q?=C4=8Cavoj?= , git@vger.kernel.org, Jeff King Subject: Re: [PATCH] sequencer: fix gpg option passed to octopus merge References: <20201011224804.722607-1-samuel@cavoj.net> <20201011225850.GA490427@camp.crustytoothpaste.net> <6f650960-6b32-4be5-b909-86685c6ad5ea@gmail.com> Date: Mon, 12 Oct 2020 12:41:51 -0700 In-Reply-To: (Junio C. Hamano's message of "Mon, 12 Oct 2020 09:56:35 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: FA2F38DC-0CC2-11EB-ABCC-74DE23BA3BAF-77302942!pb-smtp2.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Junio C Hamano writes: > Phillip Wood 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? > >> but it makes me wonder if we should be doing >> that here as well I was reacting only based on what I saw in these message, but it turns out that cmd above is an internal invocation of "git merge"; as the command does honor the "commit.gpgsign" option, if "rebase" or whatever command that invoked the sequencer turned off the signing by setting opts->gpg_sign to false, I agree that the part touched by the patch should have the else clause to explicitly override the configuration option.