From: Junio C Hamano Date: Mon, 14 Jan 2019 19:16:04 +0000 (-0800) Subject: Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband X-Git-Tag: v2.21.0-rc0~50^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17069c7fae20f5e3082ee639066a37de5af6030e;p=thirdparty%2Fgit.git 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 --- 17069c7fae20f5e3082ee639066a37de5af6030e diff --cc t/t5703-upload-pack-ref-in-want.sh index 7053899cb5,d2a9d0c127..f87b2f6df3 --- a/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