diff options
| author | Jeff King <peff@peff.net> | 2014-06-10 16:09:23 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-10 14:01:08 -0700 |
| commit | 3198b89fb225ef8e0200e9486a48be8068e85d15 (patch) | |
| tree | 04db2b3fda708b8b059953d160039adb08f06de5 /t | |
| parent | 64d3dc94687bf4a8a422ab6d5cffcdb44315d49e (diff) | |
| download | git-3198b89fb225ef8e0200e9486a48be8068e85d15.tar.gz git-3198b89fb225ef8e0200e9486a48be8068e85d15.tar.xz | |
repack: respect pack.writebitmaps
The config option to turn on bitmaps is read all the way
down in the plumbing of pack-objects. This makes it hard for
other options in the porcelain of repack to make decisions
based on the bitmap setting. For example,
repack.packKeptObjects tries to kick in by default only when
bitmaps are turned on. But it can't do so reliably because
it doesn't yet know whether we are using bitmaps.
This patch teaches repack to respect pack.writebitmaps. It
means we pass a redundant command-line flag to pack-objects,
but that's OK; it shouldn't affect the outcome.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7700-repack.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index f207b91f0..e70b98358 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -35,7 +35,7 @@ test_expect_success 'objects in packs marked .keep are not repacked' ' test -z "$found_duplicate_object" ' -test_expect_success 'writing bitmaps can duplicate .keep objects' ' +test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' ' # build on $objsha1, $packsha1, and .keep state from previous git repack -Adbl && test_when_finished "found_duplicate_object=" && @@ -51,6 +51,22 @@ test_expect_success 'writing bitmaps can duplicate .keep objects' ' test "$found_duplicate_object" = 1 ' +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 && + test_when_finished "found_duplicate_object=" && + for p in .git/objects/pack/*.idx; do + idx=$(basename $p) + test "pack-$packsha1.idx" = "$idx" && continue + if git verify-pack -v $p | egrep "^$objsha1"; then + found_duplicate_object=1 + echo "DUPLICATE OBJECT FOUND" + break + fi + done && + test "$found_duplicate_object" = 1 +' + test_expect_success 'loose objects in alternate ODB are not repacked' ' mkdir alt_objects && echo `pwd`/alt_objects > .git/objects/info/alternates && |