summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-03 04:13:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-03 04:13:27 (GMT)
commit9ac54d0f59978b92201e3ca728eed0ea7545667a (patch)
tree4698efc962d4ab9b4dc9be4c559a100c1924a3a8 /t
parentb65f30b6b3bf34831b32a1b209bc1955f2bf79df (diff)
parentdf995c7dd21bca9c61f9e5480fdfc1a015b4f1a0 (diff)
downloadgit-9ac54d0f59978b92201e3ca728eed0ea7545667a.zip
git-9ac54d0f59978b92201e3ca728eed0ea7545667a.tar.gz
git-9ac54d0f59978b92201e3ca728eed0ea7545667a.tar.bz2
Merge branch 'tu/gc-auto-quiet'
"gc --auto" notified the user that auto-packing has triggered even under the "--quiet" option. * tu/gc-auto-quiet: silence git gc --auto --quiet output
Diffstat (limited to 't')
-rwxr-xr-xt/t5400-send-pack.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 250c720..78ab177 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -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
'