Merge branch 'maint-1.7.0' into maint

diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index 00da70763bc34fe05dcba90a48799e32880571ce..c229fe68f11007fbb96d7b3837c18fd2f306a0bf 100755 (executable)
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -2,9 +2,14 @@
 
 test_description='push with --set-upstream'
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
+
+ensure_fresh_upstream() {
+       rm -rf parent && git init --bare parent
+}
 
 test_expect_success 'setup bare parent' '
-       git init --bare parent &&
+       ensure_fresh_upstream &&
        git remote add upstream parent
 '
 
@@ -66,4 +71,41 @@ test_expect_success 'push -u HEAD' '
        check_config headbranch upstream refs/heads/headbranch
 '
 
+test_expect_success TTY 'progress messages go to tty' '
+       ensure_fresh_upstream &&
+
+       test_terminal git push -u upstream master >out 2>err &&
+       grep "Writing objects" err
+'
+
+test_expect_success 'progress messages do not go to non-tty' '
+       ensure_fresh_upstream &&
+
+       # skip progress messages, since stderr is non-tty
+       git push -u upstream master >out 2>err &&
+       ! grep "Writing objects" err
+'
+
+test_expect_success 'progress messages go to non-tty (forced)' '
+       ensure_fresh_upstream &&
+
+       # force progress messages to stderr, even though it is non-tty
+       git push -u --progress upstream master >out 2>err &&
+       grep "Writing objects" err
+'
+
+test_expect_success TTY 'push -q suppresses progress' '
+       ensure_fresh_upstream &&
+
+       test_terminal git push -u -q upstream master >out 2>err &&
+       ! grep "Writing objects" err
+'
+
+test_expect_failure TTY 'push --no-progress suppresses progress' '
+       ensure_fresh_upstream &&
+
+       test_terminal git push -u --no-progress upstream master >out 2>err &&
+       ! grep "Writing objects" err
+'
+
 test_done