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

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 250c720c14602bdf21e6a7200437b13fe6feaca3..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 &&
@@ -174,8 +174,7 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' '
            cd parent &&
            echo "Even more text" >>file.txt &&
            git commit -a -m "Third commit" &&
-           git send-pack ../child HEAD:refs/heads/test_auto_gc >output 2>&1 &&
-           grep "Auto packing the repository for optimum performance." output
+           git send-pack ../child HEAD:refs/heads/test_auto_gc
        ) &&
        test ! -e child/.git/objects/tmp_test_object
 '