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

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 250c720c14602bdf21e6a7200437b13fe6feaca3..418f515ada50f1687a010a8f335f9363da5a0a3b 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 &&