diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 18:33:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 18:33:52 (GMT) |
| commit | a15bfa517dc2b8165ca038300faef60fa66cfcc6 (patch) | |
| tree | 3e75a564ec07407ba335b60bf3295b2118d8405e | |
| parent | d18d09bb81c5b1d0736b8945ca2a9e510286a2b4 (diff) | |
| parent | 10c600172cc005fb43d110fdfaf0c45f9544a079 (diff) | |
| download | git-a15bfa517dc2b8165ca038300faef60fa66cfcc6.zip git-a15bfa517dc2b8165ca038300faef60fa66cfcc6.tar.gz git-a15bfa517dc2b8165ca038300faef60fa66cfcc6.tar.bz2 | |
Merge branch 'sg/t5310-empty-input-fix'
Test fix.
* sg/t5310-empty-input-fix:
t5310-pack-bitmaps: fix bogus 'pack-objects to file can use bitmap' test
| -rwxr-xr-x | t/t5310-pack-bitmaps.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index 6ee4d3f..557bd0d 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -9,7 +9,8 @@ objpath () { # show objects present in pack ($1 should be associated *.idx) list_packed_objects () { - git show-index <"$1" | cut -d' ' -f2 + git show-index <"$1" >object-list && + cut -d' ' -f2 object-list } # has_any pattern-file content-file @@ -204,8 +205,8 @@ test_expect_success 'pack-objects to file can use bitmap' ' # verify equivalent packs are generated with/without using bitmap index packasha1=$(git pack-objects --no-use-bitmap-index --all packa </dev/null) && packbsha1=$(git pack-objects --use-bitmap-index --all packb </dev/null) && - list_packed_objects <packa-$packasha1.idx >packa.objects && - list_packed_objects <packb-$packbsha1.idx >packb.objects && + list_packed_objects packa-$packasha1.idx >packa.objects && + list_packed_objects packb-$packbsha1.idx >packb.objects && test_cmp packa.objects packb.objects ' |