diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-05 23:58:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-05 23:58:42 -0800 |
| commit | 4802997c7531835f16b6fce690854d9a75119d0b (patch) | |
| tree | 1199a1a8e09b18543e2adf3faccb5ee292d554cf /t | |
| parent | 1c719ffc3d1c4e03313d5cf5c4d32ec763697857 (diff) | |
| parent | d336572f57e398318a0f6c51cc760d5be9872cc2 (diff) | |
| download | git-4802997c7531835f16b6fce690854d9a75119d0b.tar.gz git-4802997c7531835f16b6fce690854d9a75119d0b.tar.xz | |
Merge branch 'cb/push-quiet' into maint
* 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 c229fe68f..9ee52cfc4 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 9b85d420c..6c9ec6f11 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 |