Merge branch 'nd/grep-true-path' into maint

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