diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-29 00:50:50 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-29 00:50:50 +0400 |
| commit | e2450e1245cdbcb709e841069039077ab0a2a96a (patch) | |
| tree | cc4f2578f77903501b017597162010b9ea6acd58 /t | |
| parent | d393d140b5656e608b332c00ea3b14f9a060d604 (diff) | |
| parent | 373c67da1df7fcd33593ca26e6d67f177152b21a (diff) | |
Merge branch 'jk/pack-bitmap'
Instead of dying when asked to (re)pack with the reachability
bitmap when a bitmap cannot be built, just (re)pack without
producing a bitmap in such a case, with a warning.
* jk/pack-bitmap:
pack-objects: turn off bitmaps when skipping objects
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5310-pack-bitmaps.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index d3a3afaba8..f13525caa3 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -91,7 +91,10 @@ test_expect_success 'fetch (partial bitmap)' ' test_expect_success 'incremental repack cannot create bitmaps' ' test_commit more-1 && - test_must_fail git repack -d + find .git/objects/pack -name "*.bitmap" >expect && + git repack -d && + find .git/objects/pack -name "*.bitmap" >actual && + test_cmp expect actual ' test_expect_success 'incremental repack can disable bitmaps' ' |