diff options
| author | David Turner <dturner@twosigma.com> | 2016-12-28 17:45:42 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-29 13:45:37 -0800 |
| commit | 1c409a705cb30ae3db6cdd48757c4a85f51456d4 (patch) | |
| tree | 31094619358b4e3634660cc2c7a7aacc786d27d0 /t | |
| parent | bdf56de896b48d6fe3ad90e92138b5fd6579748d (diff) | |
| download | git-1c409a705cb30ae3db6cdd48757c4a85f51456d4.tar.gz | |
repack: die on incremental + write-bitmap-indexdt/disable-bitmap-in-auto-gc
The bitmap index only works for single packs, so requesting an
incremental repack with bitmap indexes makes no sense.
Signed-off-by: David Turner <dturner@twosigma.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -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 3893afd687..03b6552c42 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -105,12 +105,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' ' |