Merge branch 'jk/t5516-deflake' into maint

gitster · gitster · commit 13f6beaf9d5f · 2021-02-05T16:31:25.000-08:00
Test fix.

* jk/t5516-deflake:
  t5516: loosen "not our ref" error check
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1260,7 +1260,9 @@ do`
`1260`	`1260`	`git cat-file commit $SHA1_2 &&`
`1261`	`1261`	`test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \`
`1262`	`1262`	`git fetch ../testrepo/.git $SHA1_3 2>err &&`
`1263`		`- test_i18ngrep "remote error:.not our ref.$SHA1_3\$" err`
	`1263`	`+ # ideally we would insist this be on a "remote error:"`
	`1264`	`+ # line, but it is racy; see the commit message`
	`1265`	`+ test_i18ngrep "not our ref.*$SHA1_3\$" err`
`1264`	`1266`	`)`
`1265`	`1267`	`'`
`1266`	`1268`	`done`