diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:29:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:29:50 -0700 |
| commit | 8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8 (patch) | |
| tree | f9d4707fbe40cc0530dc2eb51af5c813089eee02 /t/lib-httpd | |
| parent | Merge branch 'nl/rebase-i-cheat-sheet' into maint (diff) | |
| parent | http-backend: respect existing GIT_COMMITTER_* variables (diff) | |
| download | git-8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8.tar.gz git-8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8.zip | |
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/lib-httpd')
| -rw-r--r-- | t/lib-httpd/apache.conf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 3c12b05d60..de3762e247 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -52,8 +52,15 @@ Alias /auth/ www/auth/ <Location /smart_noexport/> SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} </Location> +<Location /smart_custom_env/> + SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} + SetEnv GIT_HTTP_EXPORT_ALL + SetEnv GIT_COMMITTER_NAME "Custom User" + SetEnv GIT_COMMITTER_EMAIL custom@example.com +</Location> ScriptAlias /smart/ ${GIT_EXEC_PATH}/git-http-backend/ ScriptAlias /smart_noexport/ ${GIT_EXEC_PATH}/git-http-backend/ +ScriptAlias /smart_custom_env/ ${GIT_EXEC_PATH}/git-http-backend/ <Directory ${GIT_EXEC_PATH}> Options None </Directory> |