summaryrefslogtreecommitdiff
path: root/t/t5541-http-push.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-03 22:13:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-03 22:13:55 (GMT)
commit4c732da91cea2156979a0cc73cc772ef024e7b9a (patch)
tree566b6d7db549e6720af66801fb03fdae906b8fe6 /t/t5541-http-push.sh
parentf4ed0af6e2762bc43de474d1fcaa2863b00268eb (diff)
parente304aeba20d6f26cb95c022704440a36ef309075 (diff)
downloadgit-4c732da91cea2156979a0cc73cc772ef024e7b9a.zip
git-4c732da91cea2156979a0cc73cc772ef024e7b9a.tar.gz
git-4c732da91cea2156979a0cc73cc772ef024e7b9a.tar.bz2
Merge branch 'jk/maint-push-progress'
"git push" over smart-http lost progress output and this resurrects it. 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/t5541-http-push.sh')
-rwxr-xr-xt/t5541-http-push.sh27
1 files changed, 25 insertions, 2 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 5b170be..312e484 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -216,13 +216,36 @@ 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
+'
+
test_expect_success 'http push gives sane defaults to reflog' '
cd "$ROOT_PATH"/test_repo_clone &&
test_commit reflog-test &&