diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 12:23:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 12:23:19 -0700 |
| commit | 25f3119000ab8b98cb54e9925f4e307a5dab2f87 (patch) | |
| tree | 6e655c84ad726de98d3d6b929e1171727d41246b /t/t7700-repack.sh | |
| parent | b30adaac5238a611f12c407912b75112ad4cf186 (diff) | |
| parent | 2d0174e38eed8143b1df0584a6c038fdaee5b89b (diff) | |
| download | git-25f3119000ab8b98cb54e9925f4e307a5dab2f87.tar.gz | |
Merge branch 'jk/repack-pack-writebitmaps-config'
* jk/repack-pack-writebitmaps-config:
t7700: drop explicit --no-pack-kept-objects from .keep test
repack: introduce repack.writeBitmaps config option
repack: simplify handling of --write-bitmap-index
pack-objects: stop respecting pack.writebitmaps
Diffstat (limited to 't/t7700-repack.sh')
| -rwxr-xr-x | t/t7700-repack.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index 61e6ed37aa..021c5479bd 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -21,7 +21,7 @@ test_expect_success 'objects in packs marked .keep are not repacked' ' objsha1=$(git verify-pack -v pack-$packsha1.idx | head -n 1 | sed -e "s/^\([0-9a-f]\{40\}\).*/\1/") && mv pack-* .git/objects/pack/ && - git repack --no-pack-kept-objects -A -d -l && + git repack -A -d -l && git prune-packed && for p in .git/objects/pack/*.idx; do idx=$(basename $p) @@ -53,7 +53,7 @@ test_expect_success 'writing bitmaps via command-line can duplicate .keep object test_expect_success 'writing bitmaps via config can duplicate .keep objects' ' # build on $objsha1, $packsha1, and .keep state from previous - git -c pack.writebitmaps=true repack -Adl && + git -c repack.writebitmaps=true repack -Adl && test_when_finished "found_duplicate_object=" && for p in .git/objects/pack/*.idx; do idx=$(basename $p) |