Merge branch 'maint'

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 78ab17793894ed902468e1f7af5841b67eeef2ff..0736bcbcd52a76ef3400c046e7d3558dd1a866c7 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -159,11 +159,12 @@ 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 &&
            git config gc.autopacklimit 1 &&
+           git config gc.autodetach false &&
            git branch test_auto_gc &&
            # And create a file that follows the temporary object naming
            # convention for the auto-gc to remove