Skip to content

Commit a15bfa5

Browse files
committed
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
2 parents d18d09b + 10c6001 commit a15bfa5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

t/t5310-pack-bitmaps.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ objpath () {
99

1010
# show objects present in pack ($1 should be associated *.idx)
1111
list_packed_objects () {
12-
git show-index <"$1" | cut -d' ' -f2
12+
git show-index <"$1" >object-list &&
13+
cut -d' ' -f2 object-list
1314
}
1415

1516
# has_any pattern-file content-file
@@ -204,8 +205,8 @@ test_expect_success 'pack-objects to file can use bitmap' '
204205
# verify equivalent packs are generated with/without using bitmap index
205206
packasha1=$(git pack-objects --no-use-bitmap-index --all packa </dev/null) &&
206207
packbsha1=$(git pack-objects --use-bitmap-index --all packb </dev/null) &&
207-
list_packed_objects <packa-$packasha1.idx >packa.objects &&
208-
list_packed_objects <packb-$packbsha1.idx >packb.objects &&
208+
list_packed_objects packa-$packasha1.idx >packa.objects &&
209+
list_packed_objects packb-$packbsha1.idx >packb.objects &&
209210
test_cmp packa.objects packb.objects
210211
'
211212

0 commit comments

Comments
 (0)