Merge branch 'dl/mingw-header-cleanup'
Header clean-up.
* dl/mingw-header-cleanup:
compat/mingw.h: drop extern from function declaration
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 7e928af..af0385f 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -282,10 +282,9 @@
EOF
test_must_fail env PATH="$TRASH_DIRECTORY:$PATH" git push \
--signed --atomic --porcelain \
- dst noop ff noff >out 2>&1 &&
+ dst noop ff noff >out 2>err &&
- test_i18ngrep ! "gpg failed to sign" out &&
- sed -n -e "/^To dst/,$ p" out >actual &&
+ test_i18ngrep ! "gpg failed to sign" err &&
cat >expect <<-EOF &&
To dst
= refs/heads/noop:refs/heads/noop [up to date]
@@ -293,7 +292,7 @@
! refs/heads/noff:refs/heads/noff [rejected] (non-fast-forward)
Done
EOF
- test_i18ncmp expect actual
+ test_cmp expect out
'
test_done