Merge branch 'sg/t5310-jgit-wants-sha1'

gitster · gitster · commit d3021700461e · 2020-11-25T15:24:53.000-08:00
Since jgit does not yet work with SHA-256 repositories, mark the
tests that uses it not to run unless we are testing with ShA-1
repositories.

* sg/t5310-jgit-wants-sha1:
  t5310-pack-bitmaps: skip JGit tests with SHA256
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
@@ -277,7 +277,7 @@ test_expect_success 'pack with missing parent' '
 	git pack-objects --stdout --revs <revs >/dev/null
 '
 
-test_expect_success JGIT 'we can read jgit bitmaps' '
+test_expect_success JGIT,SHA1 'we can read jgit bitmaps' '
 	git clone --bare . compat-jgit.git &&
 	(
 		cd compat-jgit.git &&
@@ -287,7 +287,7 @@ test_expect_success JGIT 'we can read jgit bitmaps' '
 	)
 '
 
-test_expect_success JGIT 'jgit can read our bitmaps' '
+test_expect_success JGIT,SHA1 'jgit can read our bitmaps' '
 	git clone --bare . compat-us.git &&
 	(
 		cd compat-us.git &&

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ test_expect_success 'pack with missing parent' '`
`277`	`277`	`git pack-objects --stdout --revs <revs >/dev/null`
`278`	`278`	`'`
`279`	`279`
`280`		`-test_expect_success JGIT 'we can read jgit bitmaps' '`
	`280`	`+test_expect_success JGIT,SHA1 'we can read jgit bitmaps' '`
`281`	`281`	`git clone --bare . compat-jgit.git &&`
`282`	`282`	`(`
`283`	`283`	`cd compat-jgit.git &&`
`@@ -287,7 +287,7 @@ test_expect_success JGIT 'we can read jgit bitmaps' '`
`287`	`287`	`)`
`288`	`288`	`'`
`289`	`289`
`290`		`-test_expect_success JGIT 'jgit can read our bitmaps' '`
	`290`	`+test_expect_success JGIT,SHA1 'jgit can read our bitmaps' '`
`291`	`291`	`git clone --bare . compat-us.git &&`
`292`	`292`	`(`
`293`	`293`	`cd compat-us.git &&`