diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-29 13:18:50 -0800 |
| commit | 7b718fbf17f5b51887d420e6edc9dcb7b0c0f83c (patch) | |
| tree | 4eb9885e931f18d6dfb9c3c6dc5484a0b60d1250 /t | |
| parent | 7859f533e2247f21cdf3fa74e78b600c9ec62270 (diff) | |
| parent | d336572f57e398318a0f6c51cc760d5be9872cc2 (diff) | |
| download | git-7b718fbf17f5b51887d420e6edc9dcb7b0c0f83c.tar.gz | |
Merge branch 'cb/push-quiet'
* cb/push-quiet:
t5541: avoid TAP test miscounting
fix push --quiet: add 'quiet' capability to receive-pack
server_supports(): parse feature list more carefully
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5523-push-upstream.sh | 7 | ||||
| -rwxr-xr-x | t/t5541-http-push.sh | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh index c229fe68f1..9ee52cfc45 100755 --- a/t/t5523-push-upstream.sh +++ b/t/t5523-push-upstream.sh @@ -108,4 +108,11 @@ test_expect_failure TTY 'push --no-progress suppresses progress' ' ! grep "Writing objects" err ' +test_expect_success TTY 'quiet push' ' + ensure_fresh_upstream && + + test_terminal git push --quiet --no-progress upstream master 2>&1 | tee output && + test_cmp /dev/null output +' + test_done diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index 9b85d420c3..6c9ec6f117 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -14,6 +14,7 @@ fi ROOT_PATH="$PWD" LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5541'} . "$TEST_DIRECTORY"/lib-httpd.sh +. "$TEST_DIRECTORY"/lib-terminal.sh start_httpd test_expect_success 'setup remote repository' ' @@ -186,5 +187,12 @@ test_expect_success 'push --mirror to repo with alternates' ' git push --mirror "$HTTPD_URL"/smart/alternates-mirror.git ' +test_expect_success TTY 'quiet push' ' + cd "$ROOT_PATH"/test_repo_clone && + test_commit quiet && + test_terminal git push --quiet --no-progress 2>&1 | tee output && + test_cmp /dev/null output +' + stop_httpd test_done |