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

diff --cc git-remote-gcrypt
index 94a3d135c4317d0e0e8b3f48a71e49e8067cd5bf,3d8a39bb6cd15899ea214da5c9b72a111229012e..54db70928832b0c868135c2025be98b5c670ba96
--- 1/git-remote-gcrypt
--- 2/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
  }