mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-23 07:56:24 +02:00
Code

Merge branch 'jk/t5516-deflake' into next 

Test fix.

* jk/t5516-deflake:
  t5516: loosen "not our ref" error check
This commit is contained in:
Junio C Hamano 2021-01-12 17:29:44 -08:00
parent 2aca21c42e acaabcf391
commit ed5317a798
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t5516-fetch-push.sh
View File

@ -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