implement GCRYPT_GPG_ARGS

diff --git a/README.rst b/README.rst
index b2f82857dcfcb0ea4aea1785a402fbd8cae8c2c4..148abadca38abefec611e17ec3bc176a02c7874e 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -84,6 +84,10 @@ Environment Variables
 *GCRYPT_FULL_REPACK*
     This environment variable forces full repack when pushing.
 
+*GCRYPT_GPG_ARGS*
+    The contents of this environment variable are passed as arguments
+    to gpg.  E.g. ``export GCRYPT_GPG_ARGS="--use-agent"``.
+
 Examples
 ========
 

diff --git a/debian/changelog b/debian/changelog
index 09338978c05674f7ede477790fa1fe8493f8ca31..18bfbaca7721f32427dc8e52462a6810b04e8082 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ git-remote-gcrypt (1.0.0) UNRELEASED; urgency=medium
 
   * Switch to Debian-native package: taking over as upstream.
   * Remove notice about repository format potentially changing.
+  * Implement GCRYPT_GPG_ARGS environment variable (Closes: #771011).
 
  -- Sean Whitton <spwhitton@spwhitton.name>  Sun, 17 Jan 2016 19:12:42 -0700
 

diff --git a/git-remote-gcrypt b/git-remote-gcrypt
index 6c93a3cb9dda29b0bc6df63dadfd2991905cee4d..94a3d135c4317d0e0e8b3f48a71e49e8067cd5bf 100755 (executable)
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@ -371,9 +371,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 "${GCRYPT_GPG_ARGS:-}" "$@"
        else
-               gpg "$@"
+               gpg "${GCRYPT_GPG_ARGS:-}" "$@"
        fi
 }