summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-21 15:14:37 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-21 15:14:37 -0800
commitc7707a4354f36c59f3310d4edfb18377c064220e (patch)
treee77a6031b8e1f5b700d334389a3235313d4d642f /t
parentMerge branch 'jk/git-dir-lookup' into maint (diff)
parentpush/fetch/clone --no-progress suppresses progress output (diff)
downloadtgif-c7707a4354f36c59f3310d4edfb18377c064220e.tar.xz
Merge branch 'cb/transfer-no-progress' into maint
* cb/transfer-no-progress: push/fetch/clone --no-progress suppresses progress output
Diffstat (limited to 't')
-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
'