diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-25 15:24:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-25 15:24:53 -0800 |
| commit | d3021700461e63ff12cf2d24500f0c61b2fbf5e0 (patch) | |
| tree | b1a4b1bab13e5a6b8138354676b30ef6674609d7 | |
| parent | Merge branch 'rs/archive-plug-leak-refname' (diff) | |
| parent | t5310-pack-bitmaps: skip JGit tests with SHA256 (diff) | |
| download | tgif-d3021700461e63ff12cf2d24500f0c61b2fbf5e0.tar.xz | |
Merge branch 'sg/t5310-jgit-wants-sha1'
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
| -rwxr-xr-x | t/t5310-pack-bitmaps.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index 8318781d2b..1d40fcad39 100755 --- 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 && |