merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
6
third_party/git/t/lib-httpd/apache.conf
vendored
6
third_party/git/t/lib-httpd/apache.conf
vendored
|
|
@ -113,7 +113,7 @@ Alias /auth/dumb/ www/auth/dumb/
|
|||
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
|
||||
SetEnv GIT_HTTP_EXPORT_ALL
|
||||
</LocationMatch>
|
||||
<LocationMatch /one_time_sed/>
|
||||
<LocationMatch /one_time_perl/>
|
||||
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
|
||||
SetEnv GIT_HTTP_EXPORT_ALL
|
||||
</LocationMatch>
|
||||
|
|
@ -122,7 +122,7 @@ ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
|
|||
ScriptAlias /broken_smart/ broken-smart-http.sh/
|
||||
ScriptAlias /error_smart/ error-smart-http.sh/
|
||||
ScriptAlias /error/ error.sh/
|
||||
ScriptAliasMatch /one_time_sed/(.*) apply-one-time-sed.sh/$1
|
||||
ScriptAliasMatch /one_time_perl/(.*) apply-one-time-perl.sh/$1
|
||||
<Directory ${GIT_EXEC_PATH}>
|
||||
Options FollowSymlinks
|
||||
</Directory>
|
||||
|
|
@ -135,7 +135,7 @@ ScriptAliasMatch /one_time_sed/(.*) apply-one-time-sed.sh/$1
|
|||
<Files error.sh>
|
||||
Options ExecCGI
|
||||
</Files>
|
||||
<Files apply-one-time-sed.sh>
|
||||
<Files apply-one-time-perl.sh>
|
||||
Options ExecCGI
|
||||
</Files>
|
||||
<Files ${GIT_EXEC_PATH}/git-http-backend>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue