summaryrefslogtreecommitdiff
path: root/t/t5523-push-upstream.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-20 00:14:55 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-20 00:14:55 -0800
commit592d051759f27ba6f5295423c8e13922081d79e1 (patch)
tree7aad6f10decaa6fc849b3380bcd18c95223223ff /t/t5523-push-upstream.sh
parent13dd790bbe658e03e429d91b8babe3a284663d6e (diff)
parent01fdc21f6e90f56fc5a49cbba751d9ead19b2f03 (diff)
downloadgit-592d051759f27ba6f5295423c8e13922081d79e1.tar.gz
Merge branch 'cb/transfer-no-progress'
* cb/transfer-no-progress: push/fetch/clone --no-progress suppresses progress output
Diffstat (limited to 't/t5523-push-upstream.sh')
-rwxr-xr-xt/t5523-push-upstream.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index 9ee52cfc45..3683df13a6 100755
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -101,10 +101,11 @@ test_expect_success TTY 'push -q suppresses progress' '
! grep "Writing objects" err
'
-test_expect_failure TTY 'push --no-progress suppresses progress' '
+test_expect_success TTY 'push --no-progress suppresses progress' '
ensure_fresh_upstream &&
test_terminal git push -u --no-progress upstream master >out 2>err &&
+ ! grep "Unpacking objects" err &&
! grep "Writing objects" err
'