summaryrefslogtreecommitdiff
path: root/t/t5523-push-upstream.sh
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2012-02-13 20:17:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-13 21:06:53 (GMT)
commit01fdc21f6e90f56fc5a49cbba751d9ead19b2f03 (patch)
tree7a8503c31417735d5765ddd1c2a63749e254d513 /t/t5523-push-upstream.sh
parent58d4203aa617293d1dc3746a1ea33d84eb766e0f (diff)
downloadgit-01fdc21f6e90f56fc5a49cbba751d9ead19b2f03.zip
git-01fdc21f6e90f56fc5a49cbba751d9ead19b2f03.tar.gz
git-01fdc21f6e90f56fc5a49cbba751d9ead19b2f03.tar.bz2
push/fetch/clone --no-progress suppresses progress output
By default, progress output is disabled if stderr is not a terminal. The --progress option can be used to force progress output anyways. Conversely, --no-progress does not force progress output. In particular, if stderr is a terminal, progress output is enabled. This is unintuitive. Change --no-progress to force output off. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 9ee52cf..3683df1 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
'