diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-01-17 22:13:52 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-01-17 22:13:52 -0700 |
| commit | 3c1f85ac70f00169ade3dd8287603523aaf2405b (patch) | |
| tree | b914b58e30512a2f0fb32c060baab507cac85404 /git-remote-gcrypt | |
| parent | eefd875b9cee04232de5f62f6cb74963a0e45912 (diff) | |
| parent | b43e192e5132bbfe297dcd8b58c49ed78aaae899 (diff) | |
| download | git-remote-gcrypt-3c1f85ac70f00169ade3dd8287603523aaf2405b.tar.gz | |
Merge remote-tracking branch 'chrysn/master' into devel
Diffstat (limited to 'git-remote-gcrypt')
| -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 94a3d13..54db709 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 "${GCRYPT_GPG_ARGS:-}" "$@" + ${GPG} --no-tty "${GCRYPT_GPG_ARGS:-}" "$@" else - gpg "${GCRYPT_GPG_ARGS:-}" "$@" + ${GPG} "${GCRYPT_GPG_ARGS:-}" "$@" fi } |