diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-14 19:16:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 19:16:04 (GMT) |
| commit | 17069c7fae20f5e3082ee639066a37de5af6030e (patch) | |
| tree | 52b612da693386eae08a4d87540c15744d468b13 /t/t5703-upload-pack-ref-in-want.sh | |
| parent | ecbdaf0899161c067986e9d9d564586d4b045d62 (diff) | |
| parent | 2d103c31c2cfcf03ff1408d639043469b0c93f70 (diff) | |
| download | git-17069c7fae20f5e3082ee639066a37de5af6030e.zip git-17069c7fae20f5e3082ee639066a37de5af6030e.tar.gz git-17069c7fae20f5e3082ee639066a37de5af6030e.tar.bz2 | |
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
Diffstat (limited to 't/t5703-upload-pack-ref-in-want.sh')
| -rwxr-xr-x | t/t5703-upload-pack-ref-in-want.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh index 7053899..f87b2f6 100755 --- a/t/t5703-upload-pack-ref-in-want.sh +++ b/t/t5703-upload-pack-ref-in-want.sh @@ -208,7 +208,7 @@ test_expect_success 'server is initially ahead - no ref in want' ' 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 + 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 @@ test_expect_success 'server loses a ref - ref in want' ' 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 + test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err ' stop_httpd |