From 7d275cd5c04645de4da789ace92cae6b03d3c93d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jonas=20Brandst=C3=B6tter?= Date: Sat, 12 Jul 2025 01:23:47 +0200 Subject: [PATCH] gpg-interface: expand gpg.program as a path MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- Documentation/config/gpg.adoc | 2 +- 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 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; -- 2.47.3