mirror of
https://github.com/git/git
synced 2024-11-04 16:17:49 +00:00
61f8bb1ec1
git-rev-list(1) can speed up its object size calculations for reachable objects via a bitmap walk, if there is any bitmap. This is done in `try_bitmap_disk_usage()`, which tries to optimistically load the bitmap and then use it, if available. It never frees it though, leading to a memory leak. Fix this. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
82 lines
2.4 KiB
Bash
Executable file
82 lines
2.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='basic tests of rev-list --disk-usage'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
# we want a mix of reachable and unreachable, as well as
|
|
# objects in the bitmapped pack and some outside of it
|
|
test_expect_success 'set up repository' '
|
|
test_commit --no-tag one &&
|
|
test_commit --no-tag two &&
|
|
git repack -adb &&
|
|
git reset --hard HEAD^ &&
|
|
test_commit --no-tag three &&
|
|
test_commit --no-tag four &&
|
|
git reset --hard HEAD^
|
|
'
|
|
|
|
# We don't want to hardcode sizes, because they depend on the exact details of
|
|
# packing, zlib, etc. We'll assume that the regular rev-list and cat-file
|
|
# machinery works and compare the --disk-usage output to that.
|
|
disk_usage_slow () {
|
|
git rev-list --no-object-names "$@" |
|
|
git cat-file --batch-check="%(objectsize:disk)" |
|
|
perl -lne '$total += $_; END { print $total}'
|
|
}
|
|
|
|
# check behavior with given rev-list options; note that
|
|
# whitespace is not preserved in args
|
|
check_du () {
|
|
args=$*
|
|
|
|
test_expect_success "generate expected size ($args)" "
|
|
disk_usage_slow $args >expect
|
|
"
|
|
|
|
test_expect_success "rev-list --disk-usage without bitmaps ($args)" "
|
|
git rev-list --disk-usage $args >actual &&
|
|
test_cmp expect actual
|
|
"
|
|
|
|
test_expect_success "rev-list --disk-usage with bitmaps ($args)" "
|
|
git rev-list --disk-usage --use-bitmap-index $args >actual &&
|
|
test_cmp expect actual
|
|
"
|
|
}
|
|
|
|
check_du HEAD
|
|
check_du --objects HEAD
|
|
check_du --objects HEAD^..HEAD
|
|
|
|
test_expect_success 'setup for --unpacked tests' '
|
|
git repack -adb &&
|
|
test_commit unpacked
|
|
'
|
|
|
|
check_du --all --objects --unpacked
|
|
|
|
# As mentioned above, don't use hardcode sizes as actual size, but use the
|
|
# output from git cat-file.
|
|
test_expect_success 'rev-list --disk-usage=human' '
|
|
git rev-list --objects HEAD --disk-usage=human >actual &&
|
|
disk_usage_slow --objects HEAD >actual_size &&
|
|
grep "$(cat actual_size) bytes" actual
|
|
'
|
|
|
|
test_expect_success 'rev-list --disk-usage=human with bitmaps' '
|
|
git rev-list --objects HEAD --use-bitmap-index --disk-usage=human >actual &&
|
|
disk_usage_slow --objects HEAD >actual_size &&
|
|
grep "$(cat actual_size) bytes" actual
|
|
'
|
|
|
|
test_expect_success 'rev-list use --disk-usage unproperly' '
|
|
test_must_fail git rev-list --objects HEAD --disk-usage=typo 2>err &&
|
|
cat >expect <<-\EOF &&
|
|
fatal: invalid value for '\''--disk-usage=<format>'\'': '\''typo'\'', the only allowed format is '\''human'\''
|
|
EOF
|
|
test_cmp err expect
|
|
'
|
|
|
|
test_done
|