Sync with 1.7.6.6

diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index ed4db09bed0917c034d4ee5cddff72269f46b33b..7926ab3c91e2b962760955640b8e8d45796d1e6f 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
 '
@@ -118,8 +118,7 @@ test_expect_success 'http remote detects correct HEAD' '
 test_expect_success 'fetch packed objects' '
        cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/repo.git "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git &&
        (cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git &&
-        git --bare repack &&
-        git --bare prune-packed
+        git --bare repack -a -d
        ) &&
        git clone $HTTPD_URL/dumb/repo_pack.git
 '