mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
Merge branch 'jk/t5516-deflake'
Test fix. * jk/t5516-deflake: t5516: loosen "not our ref" error check
This commit is contained in:
commit
2b8cef2307
|
@ -1260,7 +1260,9 @@ do
|
||||||
git cat-file commit $SHA1_2 &&
|
git cat-file commit $SHA1_2 &&
|
||||||
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
|
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
|
||||||
git fetch ../testrepo/.git $SHA1_3 2>err &&
|
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
|
done
|
||||||
|
|
Loading…
Reference in a new issue