diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 17:29:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 17:29:50 (GMT) |
| commit | 8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8 (patch) | |
| tree | f9d4707fbe40cc0530dc2eb51af5c813089eee02 /t/t5541-http-push.sh | |
| parent | bb16e8f42276bfca8f8b33d9dbb40c5cba50b8de (diff) | |
| parent | e32a4581bcbf1cf43cd5069a0d19df07542d612a (diff) | |
| download | git-8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8.zip git-8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8.tar.gz git-8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8.tar.bz2 | |
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
Diffstat (limited to 't/t5541-http-push.sh')
| -rwxr-xr-x | t/t5541-http-push.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index c07973e..1f5bfa2 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -30,6 +30,7 @@ test_expect_success 'setup remote repository' ' git clone --bare test_repo test_repo.git && cd test_repo.git && git config http.receivepack true && + git config core.logallrefupdates true && ORIG_HEAD=$(git rev-parse --verify HEAD) && cd - && mv test_repo.git "$HTTPD_DOCUMENT_ROOT_PATH" @@ -245,5 +246,25 @@ test_expect_success 'push --progress shows progress to non-tty' ' 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 |