Merge branch 'ph/pull-rebase-detached' into maint

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 &&