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

diff --cc builtin/send-pack.c
Simple merge

diff --cc t/lib-httpd/apache.conf
index 180a41fe9615c8023f063146a952f607c4d117d2,1a0746639c2157ef4cf58f1ad75ace65f03a38f5..497b9b9d9272ea72796aa644e67f0ab9f4392d8c
--- 1/t/lib-httpd/apache.conf
--- 2/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/

diff --cc transport-helper.c
Simple merge