Skip to content

Commit 4c180f6

Browse files
tmzullingergitster
authored andcommitted
t/lib-gpg: fix gpgconf stderr redirect to /dev/null
In 29ff1f8 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fc849d8 commit 4c180f6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/lib-gpg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ then
3131
chmod 0700 ./gpghome &&
3232
GNUPGHOME="$(pwd)/gpghome" &&
3333
export GNUPGHOME &&
34-
(gpgconf --kill gpg-agent 2>&1 >/dev/null || : ) &&
34+
(gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
3535
gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
3636
"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
3737
gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \

0 commit comments

Comments
 (0)