diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-16 05:48:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-16 05:48:46 (GMT) |
| commit | 2b8cef2307cb615e1c2dc49ecc830c63387a29cd (patch) | |
| tree | 6fb675945f6a98118c00ee82279ae410e9383cc4 /t | |
| parent | 788f488b33b5181c56414e423baf03a88aa06da4 (diff) | |
| parent | acaabcf3916e1081c39be1139af91298fd5197fe (diff) | |
| download | git-2b8cef2307cb615e1c2dc49ecc830c63387a29cd.zip git-2b8cef2307cb615e1c2dc49ecc830c63387a29cd.tar.gz git-2b8cef2307cb615e1c2dc49ecc830c63387a29cd.tar.bz2 | |
Merge branch 'jk/t5516-deflake'
Test fix.
* jk/t5516-deflake:
t5516: loosen "not our ref" error check
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5516-fetch-push.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 01004ff..3ed121d 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -1260,7 +1260,9 @@ do git cat-file commit $SHA1_2 && test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ git fetch ../testrepo/.git $SHA1_3 2>err && - test_i18ngrep "remote error:.*not our ref.*$SHA1_3\$" err + # ideally we would insist this be on a "remote error:" + # line, but it is racy; see the commit message + test_i18ngrep "not our ref.*$SHA1_3\$" err ) ' done |