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

diff --cc t/t5541-http-push.sh
index c07973ed8d2c557c0c0fa0d891e995d955fa96b9,d7964c7eb523ce95944d559e6123df4c2b6d3934..1f5bfa2d063b41d8eece768946b6143ea57f287a
--- 1/t/t5541-http-push.sh
--- 2/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