Merge branch 'jb/gpg-program-variable-is-a-pathname'

Git fork

The gpg.program configuration variable, which names a pathname to
the (custom) GPG compatible program, can now be spelled with ~tilde
expansion.

* jb/gpg-program-variable-is-a-pathname:
gpg-interface: expand gpg.program as a path

Junio C Hamano 7 months ago 3a112b53 d80b7640

+2 -2

2 changed files

expand all

unified split

Documentation

config

gpg.adoc

gpg-interface.c

+1 -1

Documentation/config/gpg.adoc

··· 1 1 gpg.program:: 2 - Use this custom program instead of "`gpg`" found on `$PATH` when 2 + Pathname of the program to use instead of "`gpg`" when 3 3 making or verifying a PGP signature. The program must support the 4 4 same command-line interface as GPG, namely, to verify a detached 5 5 signature, "`gpg --verify $signature - <$file`" is run, and the

+1 -1

gpg-interface.c

··· 783 783 784 784 if (fmtname) { 785 785 fmt = get_format_by_name(fmtname); 786 - return git_config_string((char **) &fmt->program, var, value); 786 + return git_config_pathname((char **) &fmt->program, var, value); 787 787 } 788 788 789 789 return 0;