Merge branch 'bw/cp-a-is-gnuism'

* bw/cp-a-is-gnuism:
tests: "cp -a" is a GNUism

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 78ab17793894ed902468e1f7af5841b67eeef2ff..129fc88bd28e8ea85e81310aec860df808949447 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -159,7 +159,7 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' '
            git commit -a -m "Second commit" &&
            git repack
        ) &&
-       cp -a parent child &&
+       cp -R parent child &&
        (
            # Set the child to auto-pack if more than one pack exists
            cd child &&

diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index 16ef0419e9e4ea8d42aebd63c5bc5ec7f63d3732..80d20c876bbac0b00d388d511da555a29e827dbc 100755 (executable)
--- a/t/t5550-http-fetch.sh
+++ b/t/t5550-http-fetch.sh
@@ -22,7 +22,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 &&

diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index 57023345100d3c04f9bfb1b2a701c53b6e55deed..e7dc668cef22719a778fb0447534466b88aaa245 100755 (executable)
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -76,7 +76,7 @@ test_expect_success 'pushing to local repo' '
 # git-remote-testgit, but is too slow to leave in for general use.
 : test_expect_success 'racily pushing to local repo' '
        test_when_finished "rm -rf server2 localclone2" &&
-       cp -a server server2 &&
+       cp -R server server2 &&
        git clone "testgit::${PWD}/server2" localclone2 &&
        (cd localclone2 &&
        echo content >>file &&