diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 21:08:54 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 21:08:54 +0400 |
commit | 25047b88965c8954e0599fe20c88b6a03c3ee506 (patch) | |
tree | 16dba9b704b47aab166e20e36b1918f5e0a24493 /t | |
parent | 454bf49930f9ba7e1fc9a39d9d8650f3e798c3fd (diff) | |
parent | e304aeba20d6f26cb95c022704440a36ef309075 (diff) |
Merge branch 'jk/maint-push-progress' into maint
"git push" over smart-http lost progress output a few releases ago.
By Jeff King
* jk/maint-push-progress:
t5541: test more combinations of --progress
teach send-pack about --[no-]progress
send-pack: show progress when isatty(2)
Diffstat (limited to 't')
-rwxr-xr-x | t/t5541-http-push.sh | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index cc6f081711..c07973ed8d 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -215,12 +215,35 @@ test_expect_success 'push --mirror to repo with alternates' ' git push --mirror "$HTTPD_URL"/smart/alternates-mirror.git ' -test_expect_success TTY 'quiet push' ' +test_expect_success TTY 'push shows progress when stderr is a tty' ' + cd "$ROOT_PATH"/test_repo_clone && + test_commit noisy && + test_terminal git push >output 2>&1 && + grep "^Writing objects" output +' + +test_expect_success TTY 'push --quiet silences status and progress' ' cd "$ROOT_PATH"/test_repo_clone && test_commit quiet && - test_terminal git push --quiet --no-progress 2>&1 | tee output && + test_terminal git push --quiet >output 2>&1 && test_cmp /dev/null output ' +test_expect_success TTY 'push --no-progress silences progress but not status' ' + cd "$ROOT_PATH"/test_repo_clone && + test_commit no-progress && + test_terminal git push --no-progress >output 2>&1 && + grep "^To http" output && + ! grep "^Writing objects" +' + +test_expect_success 'push --progress shows progress to non-tty' ' + cd "$ROOT_PATH"/test_repo_clone && + test_commit progress && + git push --progress >output 2>&1 && + grep "^To http" output && + grep "^Writing objects" output +' + stop_httpd test_done |