Skip to content

Commit 4b14a2f

Browse files
henning-schildgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2a635ed commit 4b14a2f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Documentation/config.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,6 +1832,11 @@ gpg.format::
18321832
Specifies which key format to use when signing with `--gpg-sign`.
18331833
Default is "openpgp", that is also the only supported value.
18341834

1835+
gpg.<format>.program::
1836+
Use this to customize the program used for the signing format you
1837+
chose. (see gpg.program) gpg.openpgp.program is a synonym for the
1838+
legacy gpg.program.
1839+
18351840
gui.commitMsgWidth::
18361841
Defines how wide the commit message window is in the
18371842
linkgit:git-gui[1]. "75" is the default.

gpg-interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ int git_gpg_config(const char *var, const char *value, void *cb)
182182
return 0;
183183
}
184184

185-
if (!strcmp(var, "gpg.program"))
185+
if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program"))
186186
fmtname = "openpgp";
187187

188188
if (fmtname) {

0 commit comments

Comments
 (0)