diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-21 09:14:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-21 09:14:29 -0700 |
| commit | 3a112b53a40e2d1240b2a4d01d5e616e0f4f09fd (patch) | |
| tree | 148cc1ce2652df0914288907caee15e9522ce123 | |
| parent | Merge branch 'cb/daemon-reap-children' (diff) | |
| parent | gpg-interface: expand gpg.program as a path (diff) | |
| download | git-3a112b53a40e2d1240b2a4d01d5e616e0f4f09fd.tar.gz git-3a112b53a40e2d1240b2a4d01d5e616e0f4f09fd.zip | |
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 path
| -rw-r--r-- | Documentation/config/gpg.adoc | 2 | ||||
| -rw-r--r-- | gpg-interface.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/gpg.adoc b/Documentation/config/gpg.adoc index 5cf32b179d..240e46c050 100644 --- a/Documentation/config/gpg.adoc +++ b/Documentation/config/gpg.adoc @@ -1,5 +1,5 @@ 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 same command-line interface as GPG, namely, to verify a detached signature, "`gpg --verify $signature - <$file`" is run, and the diff --git a/gpg-interface.c b/gpg-interface.c index bdcc8c2a2e..12e1d5910e 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -783,7 +783,7 @@ static int git_gpg_config(const char *var, const char *value, if (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; |