diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:25 -0800 |
| commit | 13f6beaf9d5fd315fbefa1aa1c4d624874b5966c (patch) | |
| tree | 9a220099076cfe80b83ecf7c20bae8fb0f4c3bd0 | |
| parent | c8af1f475afb01b555abe5087b6b2f46b2d00b55 (diff) | |
| parent | acaabcf3916e1081c39be1139af91298fd5197fe (diff) | |
| download | git-13f6beaf9d5fd315fbefa1aa1c4d624874b5966c.tar.gz | |
Merge branch 'jk/t5516-deflake' into maint
Test fix.
* jk/t5516-deflake:
t5516: loosen "not our ref" error check
| -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 01004ff680..3ed121d0ce 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 |