From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Oct 2021 22:43:12 +0000 (-0700)
Subject: Merge branch 'jk/http-push-status-fix'
X-Git-Tag: v2.34.0-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=735907bde1de71e2fc90712bdb3bf30fc417a8ac;p=thirdparty%2Fgit.git

Merge branch 'jk/http-push-status-fix'

"git push" client talking to an HTTP server did not diagnose the
lack of the final status report from the other side correctly,
which has been corrected.

* jk/http-push-status-fix:
  transport-helper: recognize "expecting report" error from send-pack
  send-pack: complain about "expecting report" with --helper-status
---

735907bde1de71e2fc90712bdb3bf30fc417a8ac
diff --cc t/lib-httpd/apache.conf
index 180a41fe96,1a0746639c..497b9b9d92
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@@ -115,13 -117,9 +115,14 @@@ Alias /auth/dumb/ www/auth/dumb
  	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
  	SetEnv GIT_HTTP_EXPORT_ALL
  </LocationMatch>
 +<LocationMatch /smart_v0/>
 +	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
 +	SetEnv GIT_HTTP_EXPORT_ALL
 +	SetEnv GIT_PROTOCOL
 +</LocationMatch>
  ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/
  ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/
+ ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/
  ScriptAliasMatch /error_git_upload_pack/(.*)/git-upload-pack error.sh/
  ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
  ScriptAlias /broken_smart/ broken-smart-http.sh/