Merge branch 'jb/gpg-program-variable-is-a-pathname'
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 pathmaint
commit
3a112b53a4
|
|
@ -1,5 +1,5 @@
|
||||||
gpg.program::
|
gpg.program::
|
||||||
Use this custom program instead of "`gpg`" found on `$PATH` when
|
Pathname of the program to use instead of "`gpg`" when
|
||||||
making or verifying a PGP signature. The program must support the
|
making or verifying a PGP signature. The program must support the
|
||||||
same command-line interface as GPG, namely, to verify a detached
|
same command-line interface as GPG, namely, to verify a detached
|
||||||
signature, "`gpg --verify $signature - <$file`" is run, and the
|
signature, "`gpg --verify $signature - <$file`" is run, and the
|
||||||
|
|
|
||||||
|
|
@ -783,7 +783,7 @@ static int git_gpg_config(const char *var, const char *value,
|
||||||
|
|
||||||
if (fmtname) {
|
if (fmtname) {
|
||||||
fmt = get_format_by_name(fmtname);
|
fmt = get_format_by_name(fmtname);
|
||||||
return git_config_string((char **) &fmt->program, var, value);
|
return git_config_pathname((char **) &fmt->program, var, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue