From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 18 Jan 2016 05:13:52 +0000 (-0700)
Subject: Merge remote-tracking branch 'chrysn/master' into devel
X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=3c1f85ac70f00169ade3dd8287603523aaf2405b;p=gamesguru%2Fgit-remote-gcrypt.git

Merge remote-tracking branch 'chrysn/master' into devel
---

3c1f85ac70f00169ade3dd8287603523aaf2405b
diff --cc git-remote-gcrypt
index 94a3d13,3d8a39b..54db709
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@@ -371,9 -372,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 "$@"
++		${GPG} --no-tty "${GCRYPT_GPG_ARGS:-}" "$@"
  	else
- 		gpg "${GCRYPT_GPG_ARGS:-}" "$@"
 -		${GPG} "$@"
++		${GPG} "${GCRYPT_GPG_ARGS:-}" "$@"
  	fi
  }