Merge branch 'jt/tighten-fetch-proto-v2-response'

"git fetch" was a bit loose in parsing resposes from the other side
when talking over the protocol v2.

* jt/tighten-fetch-proto-v2-response:
fetch-pack: be more precise in parsing v2 response

diff --combined t/t5702-protocol-v2.sh
index 6ab8dea8cd896f5c7656755c89cee9759804bef9,d58fbfa9e5bb13e3d73f609ac286e2bb0f526adb..0f2b09ebb8d6625b527ccc771c4725d2a314d4ee
--- 1/t/t5702-protocol-v2.sh
--- 2/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@@ -446,31 -446,6 +446,31 @@@ test_expect_success 'fetch supports inc
        git -C client cat-file -e $(git -C client rev-parse annotated_tag)
  '
  
 +test_expect_success 'upload-pack respects client shallows' '
 +      rm -rf server client trace &&
 +
 +      git init server &&
 +      test_commit -C server base &&
 +      test_commit -C server client_has &&
 +
 +      git clone --depth=1 "file://$(pwd)/server" client &&
 +
 +      # Add extra commits to the client so that the whole fetch takes more
 +      # than 1 request (due to negotiation)
 +      for i in $(test_seq 1 32)
 +      do
 +              test_commit -C client c$i
 +      done &&
 +
 +      git -C server checkout -b newbranch base &&
 +      test_commit -C server client_wants &&
 +
 +      GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
 +              fetch origin newbranch &&
 +      # Ensure that protocol v2 is used
 +      grep "fetch< version 2" trace
 +'
 +
  # Test protocol v2 with 'http://' transport
  #
  . "$TEST_DIRECTORY"/lib-httpd.sh
@@@ -537,6 -512,56 +537,56 @@@ test_expect_success 'push with http:// 
        ! grep "git< version 2" log
  '
  
+ test_expect_success 'when server sends "ready", expect DELIM' '
+       rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child &&
+ 
+       git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+       test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one &&
+ 
+       git clone "$HTTPD_URL/smart/http_parent" http_child &&
+ 
+       test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two &&
+ 
+       # After "ready" in the acknowledgments section, pretend that a FLUSH
+       # (0000) was sent instead of a DELIM (0001).
+       printf "/ready/,$ s/0001/0000/" \
+               >"$HTTPD_ROOT_PATH/one-time-sed" &&
+ 
+       test_must_fail git -C http_child -c protocol.version=2 \
+               fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err &&
+       test_i18ngrep "expected packfile to be sent after .ready." err
+ '
+ 
+ test_expect_success 'when server does not send "ready", expect FLUSH' '
+       rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child log &&
+ 
+       git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+       test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one &&
+ 
+       git clone "$HTTPD_URL/smart/http_parent" http_child &&
+ 
+       test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two &&
+ 
+       # Create many commits to extend the negotiation phase across multiple
+       # requests, so that the server does not send "ready" in the first
+       # request.
+       for i in $(test_seq 1 32)
+       do
+               test_commit -C http_child c$i
+       done &&
+ 
+       # After the acknowledgments section, pretend that a DELIM
+       # (0001) was sent instead of a FLUSH (0000).
+       printf "/acknowledgments/,$ s/0000/0001/" \
+               >"$HTTPD_ROOT_PATH/one-time-sed" &&
+ 
+       test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" git -C http_child \
+               -c protocol.version=2 \
+               fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err &&
+       grep "fetch< acknowledgments" log &&
+       ! grep "fetch< ready" log &&
+       test_i18ngrep "expected no other sections to be sent after no .ready." err
+ '
  
  stop_httpd