Skip to content

Commit

Permalink
gpg-interface: introduce new config to select per gpg format program
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
henning-schild authored and gitster committed Jul 18, 2018
1 parent 42149d7 commit b02f51b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion gpg-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit b02f51b

Please sign in to comment.