From: Todd Zullinger Date: Mon, 13 Nov 2017 21:07:45 +0000 (-0500) Subject: t/lib-gpg: fix gpgconf stderr redirect to /dev/null X-Git-Tag: v2.16.0-rc0~103^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c180f60a47f250b7c75151f8536ba56c7f1a8e2;p=thirdparty%2Fgit.git t/lib-gpg: fix gpgconf stderr redirect to /dev/null In 29ff1f8f74 (t: lib-gpg: flush gpg agent on startup, 2017-07-20), a call to gpgconf was added to kill the gpg-agent. The intention was to ignore all output from the call, but the order of the redirection needs to be switched to ensure that both stdout and stderr are redirected to /dev/null. Without this, gpgconf from gnupg-2.0 releases would output 'gpgconf: invalid option "--kill"' each time it was called. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano --- diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 43679a4c64..a5d3b2cbaa 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -31,7 +31,7 @@ then chmod 0700 ./gpghome && GNUPGHOME="$(pwd)/gpghome" && export GNUPGHOME && - (gpgconf --kill gpg-agent 2>&1 >/dev/null || : ) && + (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) && gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \ "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \