diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-01 00:32:06 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-01 00:32:06 +0300 |
| commit | 81037171a59db996e05b98878359362ead6029f9 (patch) | |
| tree | 857bc58982cc30c418c38906f88894736dd0877f /t/t5310-pack-bitmaps.sh | |
| parent | bb7c47a452ce4fa22d25da6a5e7684dbbf7033e2 (diff) | |
| parent | 1c409a705cb30ae3db6cdd48757c4a85f51456d4 (diff) | |
Merge branch 'dt/disable-bitmap-in-auto-gc' into maint
It is natural that "git gc --auto" may not attempt to pack
everything into a single pack, and there is no point in warning
when the user has configured the system to use the pack bitmap,
leading to disabling further "gc".
* dt/disable-bitmap-in-auto-gc:
repack: die on incremental + write-bitmap-index
auto gc: don't write bitmaps for incremental repacks
Diffstat (limited to 't/t5310-pack-bitmaps.sh')
| -rwxr-xr-x | t/t5310-pack-bitmaps.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index b4c7a6ff6b..424bec7d77 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -118,12 +118,10 @@ test_expect_success 'fetch (partial bitmap)' ' test_cmp expect actual ' -test_expect_success 'incremental repack cannot create bitmaps' ' +test_expect_success 'incremental repack fails when bitmaps are requested' ' test_commit more-1 && - find .git/objects/pack -name "*.bitmap" >expect && - git repack -d && - find .git/objects/pack -name "*.bitmap" >actual && - test_cmp expect actual + test_must_fail git repack -d 2>err && + test_i18ngrep "Incremental repacks are incompatible with bitmap" err ' test_expect_success 'incremental repack can disable bitmaps' ' |