diff options
author | Jeff King <peff@peff.net> | 2014-06-10 20:20:30 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-10 21:05:19 (GMT) |
commit | 71d76cb48029c94af022ea9dc9c74b4ba8bcc3a3 (patch) | |
tree | 5632c4870f1acdcb47d3d6f9661728c09786e94c /t | |
parent | 2bed2d47b4394bd6d4ae4645be9f7424009d3c9c (diff) | |
download | git-71d76cb48029c94af022ea9dc9c74b4ba8bcc3a3.zip git-71d76cb48029c94af022ea9dc9c74b4ba8bcc3a3.tar.gz git-71d76cb48029c94af022ea9dc9c74b4ba8bcc3a3.tar.bz2 |
repack: introduce repack.writeBitmaps config option
We currently have pack.writeBitmaps, which originally
operated at the pack-objects level. This should really have
been a repack.* option from day one. Let's give it the more
sensible name, but keep the old version as a deprecated
synonym.
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/perf/p5310-pack-bitmaps.sh | 3 | ||||
-rwxr-xr-x | t/t5310-pack-bitmaps.sh | 2 | ||||
-rwxr-xr-x | t/t7700-repack.sh | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh index 685d46f..f8ed857 100755 --- a/t/perf/p5310-pack-bitmaps.sh +++ b/t/perf/p5310-pack-bitmaps.sh @@ -8,6 +8,9 @@ test_perf_large_repo # note that we do everything through config, # since we want to be able to compare bitmap-aware # git versus non-bitmap git +# +# We intentionally use the deprecated pack.writebitmaps +# config so that we can test against older versions of git. test_expect_success 'setup bitmap config' ' git config pack.writebitmaps true && git config pack.writebitmaphashcache true diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index d3a3afa..d81f2c7 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -14,7 +14,7 @@ test_expect_success 'setup repo with moderate-sized history' ' git checkout master && blob=$(echo tagged-blob | git hash-object -w --stdin) && git tag tagged-blob $blob && - git config pack.writebitmaps true && + git config repack.writebitmaps true && git config pack.writebitmaphashcache true ' diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index e70b983..28f7135 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -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) |