diff options
| author |  Henning Schild <henning.schild@siemens.com> | 2018-07-17 14:50:11 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-18 10:02:21 -0700 |
| commit | b02f51b196deec70867d9616872e533e2633473c (patch) | |
| tree | 82074eb9bd2467b8d728537cc4634303b512d370 | |
| parent | gpg-interface: do not hardcode the key string len anymore (diff) | |
| download | tgif-b02f51b196deec70867d9616872e533e2633473c.tar.xz | |
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>
| -rw-r--r-- | Documentation/config.txt | 5 | ||||
| -rw-r--r-- | gpg-interface.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ac373e3f48..0e871346a7 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` and `gpg.format`) `gpg.program` can still + be used as a legacy synonym for `gpg.openpgp.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 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) { |