gpg-interface: allow use of a custom GPG binary

diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index ed4db09bed0917c034d4ee5cddff72269f46b33b..311a33ca84f693b9410bab9e282ad0ebcae87441 100755 (executable)
--- a/t/t5550-http-fetch.sh
+++ b/t/t5550-http-fetch.sh
@@ -8,8 +8,8 @@ if test -n "$NO_CURL"; then
        test_done
 fi
 
-. "$TEST_DIRECTORY"/lib-httpd.sh
 LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5550'}
+. "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
 test_expect_success 'setup repository' '
@@ -51,8 +51,8 @@ test_expect_success 'setup askpass helpers' '
        GIT_ASKPASS="$PWD/askpass" &&
        export GIT_ASKPASS &&
        >askpass-expect-none &&
-       echo "askpass: Password: " >askpass-expect-pass &&
-       { echo "askpass: Username: " &&
+       echo "askpass: Password for '\''$HTTPD_DEST'\'': " >askpass-expect-pass &&
+       { echo "askpass: Username for '\''$HTTPD_DEST'\'': " &&
          cat askpass-expect-pass
        } >askpass-expect-both
 '