[PATCH v2 7/9] gpg-interface: introduce new config to select per gpg format program
From: Henning Schild <hidden>
Date: 2018-07-10 08:53:08
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
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 <redacted> --- 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.<format>.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;
--
2.16.4