From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 10BD81F85E for ; Fri, 13 Jul 2018 08:41:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729284AbeGMIz0 (ORCPT ); Fri, 13 Jul 2018 04:55:26 -0400 Received: from david.siemens.de ([192.35.17.14]:43447 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727506AbeGMIz0 (ORCPT ); Fri, 13 Jul 2018 04:55:26 -0400 Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w6D8fO24029798 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Jul 2018 10:41:24 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w6D8fN8t023201; Fri, 13 Jul 2018 10:41:23 +0200 Date: Fri, 13 Jul 2018 10:41:22 +0200 From: Henning Schild To: Cc: Eric Sunshine , Junio C Hamano , Martin =?UTF-8?B?w4VncmVu?= , Ben Toews , Jeff King , Taylor Blau , "brian m . carlson" Subject: Re: [PATCH v2 7/9] gpg-interface: introduce new config to select per gpg format program Message-ID: <20180713104122.09845ad0@md1pvb1c.ad001.siemens.net> In-Reply-To: <4905c1907a866c0fd1a4dac978dd6ca3e468ac43.1531208187.git.henning.schild@siemens.com> References: <4905c1907a866c0fd1a4dac978dd6ca3e468ac43.1531208187.git.henning.schild@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Replies to this one have been ignored for v3. I do not know how to proceed here. Henning Am Tue, 10 Jul 2018 10:52:29 +0200 schrieb Henning Schild : > Supporting multiple signing formats we will have the need to > configure a custom program each. Add a new config value to cater for > that. > > Signed-off-by: Henning Schild > --- > Documentation/config.txt | 5 +++++ > gpg-interface.c | 2 +- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index ac373e3f4..c0bd80954 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -1832,6 +1832,11 @@ gpg.format:: > Specifies which key format to use when signing with > `--gpg-sign`. Default is "openpgp", that is also the only supported > value. > +gpg..program:: > + Use this to customize the program used for the signing > format you > + chose. (see gpg.program) gpg.openpgp.program is a synonym > for the > + legacy gpg.program. > + > gui.commitMsgWidth:: > Defines how wide the commit message window is in the > linkgit:git-gui[1]. "75" is the default. > diff --git a/gpg-interface.c b/gpg-interface.c > index ac2df498d..65098430f 100644 > --- a/gpg-interface.c > +++ b/gpg-interface.c > @@ -179,7 +179,7 @@ int git_gpg_config(const char *var, const char > *value, void *cb) return git_config_string(&gpg_format, var, value); > } > > - if (!strcmp(var, "gpg.program")) > + if (!strcmp(var, "gpg.program") || !strcmp(var, > "gpg.openpgp.program")) return > git_config_string(&gpg_formats[PGP_FMT].program, var, value); > return 0;