Merge branch 'rs/archive-zip-raw-compression'

diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index 16ef0419e9e4ea8d42aebd63c5bc5ec7f63d3732..f7d0f146f0f69775dd3fa3ea06895e2bb1a74d55 100755 (executable)
--- a/t/t5550-http-fetch.sh
+++ b/t/t5550-http-fetch.sh
@@ -13,6 +13,7 @@ LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5550'}
 start_httpd
 
 test_expect_success 'setup repository' '
+       git config push.default matching &&
        echo content1 >file &&
        git add file &&
        git commit -m one
@@ -22,7 +23,7 @@ test_expect_success 'setup repository' '
 '
 
 test_expect_success 'create http-accessible bare repository with loose objects' '
-       cp -a .git "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+       cp -R .git "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
        (cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
         git config core.bare true &&
         mkdir -p hooks &&