Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband

* ms/packet-err-check:
pack-protocol.txt: accept error packets in any context
Use packet_reader instead of packet_read_line

diff --cc fetch-pack.c
Simple merge

diff --cc t/t5703-upload-pack-ref-in-want.sh
index 7053899cb5a0cbd5cca10cb4029b70df866dbff8,d2a9d0c127d6ce43b0a23fae94df84cdddc72469..f87b2f6df329975e243ab9c00b510ee4cc588d0b
--- 1/t/t5703-upload-pack-ref-in-want.sh
--- 2/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@@ -208,7 -208,7 +208,7 @@@ test_expect_success 'server is initiall
        cp -r "$LOCAL_PRISTINE" local &&
        inconsistency master 1234567890123456789012345678901234567890 &&
        test_must_fail git -C local fetch 2>err &&
-       test_i18ngrep "ERR upload-pack: not our ref" err
 -      grep "fatal: remote error: upload-pack: not our ref" err
++      test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
  '
  
  test_expect_success 'server is initially ahead - ref in want' '
@@@ -254,7 -254,7 +254,7 @@@ test_expect_success 'server loses a re
        echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
        test_must_fail git -C local fetch 2>err &&
  
-       test_i18ngrep "ERR unknown ref refs/heads/raster" err
 -      grep "fatal: remote error: unknown ref refs/heads/raster" err
++      test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
  '
  
  stop_httpd

diff --cc transport.c
Simple merge