From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 May 2012 22:13:55 +0000 (-0700)
Subject: Merge branch 'jk/maint-push-progress'
X-Git-Tag: v1.7.11-rc0~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c732da91cea2156979a0cc73cc772ef024e7b9a;p=thirdparty%2Fgit.git

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)
---

4c732da91cea2156979a0cc73cc772ef024e7b9a
diff --cc t/t5541-http-push.sh
index 5b170be2c0,363beaf5dd..312e484090
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@@ -223,25 -229,21 +230,41 @@@ test_expect_success TTY 'push --quiet s
  	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 &&
 +	git push "$HTTPD_URL"/smart/test_repo.git &&
 +	git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git" \
 +		log -g -1 --format="%gn <%ge>" >actual &&
 +	echo "anonymous <anonymous@http.127.0.0.1>" >expect &&
 +	test_cmp expect actual
 +'
 +
 +test_expect_success 'http push respects GIT_COMMITTER_* in reflog' '
 +	cd "$ROOT_PATH"/test_repo_clone &&
 +	test_commit custom-reflog-test &&
 +	git push "$HTTPD_URL"/smart_custom_env/test_repo.git &&
 +	git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git" \
 +		log -g -1 --format="%gn <%ge>" >actual &&
 +	echo "Custom User <custom@example.com>" >expect &&
 +	test_cmp expect actual
 +'
 +
  stop_httpd
  test_done