From: Henning Schild Date: Fri, 13 Jul 2018 08:41:27 GMT Subject: [PATCH v3 5/7] gpg-interface: introduce new config to select per gpg format program Message-ID: <8e6f4f547475e3ce26799901e255a78ea74dac8e.1531470729.git.henning.schild@siemens.com> In-Reply-To: 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 93bd0fb32..f3c22b551 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -182,7 +182,7 @@ int git_gpg_config(const char *var, const char *value, void *cb) return 0; } - if (!strcmp(var, "gpg.program")) + if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program")) fmtname = "openpgp"; if (fmtname) { -- 2.16.4