diff options
| author | chrysn <chrysn@fsfe.org> | 2015-11-10 13:52:49 +0100 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-05 13:14:08 -0400 |
| commit | 1f5dc63db1c7a0bb45a1d5822142efc98b03c1c3 (patch) | |
| tree | 7779c8c837df4f94317d6db8f87650a793e8829a | |
| parent | b86f0a024393cee93d997f61c044edbbfafc53d8 (diff) | |
| download | git-remote-gcrypt-1f5dc63db1c7a0bb45a1d5822142efc98b03c1c3.zip git-remote-gcrypt-1f5dc63db1c7a0bb45a1d5822142efc98b03c1c3.tar.gz git-remote-gcrypt-1f5dc63db1c7a0bb45a1d5822142efc98b03c1c3.tar.bz2 | |
Use git's the gpg.program if configured
Keyrings managed with gpg2 can contain secret keys whose public part is
unavailable to classic gpg; on the other hand, gpg2 won't see keys
created in gpg after an initial import.
Situations in which error messages like "gpg: error reading key: public
key not found" pop up can now be circumvented by setting the gpg.program
git configuration entry to gpg2.
| -rwxr-xr-x | git-remote-gcrypt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-remote-gcrypt b/git-remote-gcrypt index 9ca9552..07e5429 100755 --- a/git-remote-gcrypt +++ b/git-remote-gcrypt @@ -30,6 +30,7 @@ Manifestfile=91bd0c092128cf2e60e1a608c31e92caf1f9c1595f83f2890ef17c0e4881aa0a Hex40="[a-f0-9]" Hex40=$Hex40$Hex40$Hex40$Hex40$Hex40$Hex40$Hex40$Hex40 Hex40=$Hex40$Hex40$Hex40$Hex40$Hex40 # Match SHA-1 hexdigest +GPG="$(git config --get "gpg.program" '.+' || echo gpg)" Did_find_repo= # yes for connected, no for no repo Localdir="${GIT_DIR:=.git}/remote-gcrypt" @@ -371,9 +372,9 @@ rungpg() # due to trying to print messages to it, even if a gpg agent is set # up. --no-tty fixes this. if [ "x$GPG_AGENT_INFO" != "x" ]; then - gpg --no-tty "$@" + ${GPG} --no-tty "$@" else - gpg "$@" + ${GPG} "$@" fi } |