From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 May 2012 17:29:50 +0000 (-0700)
Subject: Merge branch 'jk/http-backend-keep-committer-ident-env' into maint
X-Git-Tag: v1.7.10.2~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8;p=git.git

Merge branch 'jk/http-backend-keep-committer-ident-env' into maint

By Jeff King
* jk/http-backend-keep-committer-ident-env:
  http-backend: respect existing GIT_COMMITTER_* variables

Conflicts:
	t/t5541-http-push.sh
---

8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8
diff --cc t/t5541-http-push.sh
index c07973ed8,d7964c7eb..1f5bfa2d0
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@@ -229,21 -223,25 +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