From: Jonas Brandstötter Date: Fri, 11 Jul 2025 23:23:47 +0000 (+0200) Subject: gpg-interface: expand gpg.program as a path X-Git-Tag: v2.51.0-rc0~49^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d275cd5c04645de4da789ace92cae6b03d3c93d;p=thirdparty%2Fgit.git gpg-interface: expand gpg.program as a path This allows using a custom gpg program under the user's home directory by specifying a path starting with '~' [gpg] program = "~/.local/bin/mygpg" Signed-off-by: Jonas Brandstötter Signed-off-by: Junio C Hamano --- 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 0896458de5..3dfbc45385 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;