summaryrefslogtreecommitdiffstats
path: root/gpg-interface.c
diff options
context:
space:
mode:
authorHenning Schild <henning.schild@siemens.com>2018-07-17 14:50:11 +0200
committerJunio C Hamano <gitster@pobox.com>2018-07-18 19:02:21 +0200
commitb02f51b196deec70867d9616872e533e2633473c (patch)
tree82074eb9bd2467b8d728537cc4634303b512d370 /gpg-interface.c
parentgpg-interface: do not hardcode the key string len anymore (diff)
downloadgit-b02f51b196deec70867d9616872e533e2633473c.tar.xz
git-b02f51b196deec70867d9616872e533e2633473c.zip
gpg-interface: introduce new config to select per gpg format program
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 <henning.schild@siemens.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gpg-interface.c')
-rw-r--r--gpg-interface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gpg-interface.c b/gpg-interface.c
index 51cad9081d..a158f08c13 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -189,7 +189,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) {