diff options
| author | Jeff King <peff@peff.net> | 2019-07-31 05:40:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-31 20:26:25 (GMT) |
| commit | 7ff024e7b3d576fc265dbdd1a7bd3dcc6dde1eb6 (patch) | |
| tree | 9376851741e14429fa5e1e3f01d75800ff22a49c /t | |
| parent | 25575015cafbbb8554ff6ac82236c2a062055ae6 (diff) | |
| download | git-7ff024e7b3d576fc265dbdd1a7bd3dcc6dde1eb6.zip git-7ff024e7b3d576fc265dbdd1a7bd3dcc6dde1eb6.tar.gz git-7ff024e7b3d576fc265dbdd1a7bd3dcc6dde1eb6.tar.bz2 | |
repack: simplify handling of auto-bitmaps and .keep files
Commit 7328482253 (repack: disable bitmaps-by-default if .keep files
exist, 2019-06-29) taught repack to prefer disabling bitmaps to
duplicating objects (unless bitmaps were asked for explicitly).
But there's an easier way to do this: if we keep passing the
--honor-pack-keep flag to pack-objects when auto-enabling bitmaps, then
pack-objects already makes the same decision (it will disable bitmaps
rather than duplicate). Better still, pack-objects can actually decide
to do so based not just on the presence of a .keep file, but on whether
that .keep file actually impacts the new pack we're making (so if we're
racing with a push or fetch, for example, their temporary .keep file
will not block us from generating bitmaps if they haven't yet updated
their refs).
And because repack uses the --write-bitmap-index-quiet flag, we don't
have to worry about pack-objects generating confusing warnings when it
does see a .keep file. We can confirm this by tweaking the .keep test to
check repack's stderr.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index 54f815b..4e855bc 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -245,7 +245,8 @@ test_expect_success 'no bitmaps created if .keep files present' ' keep=${pack%.pack}.keep && test_when_finished "rm -f \"\$keep\"" && >"$keep" && - git -C bare.git repack -ad && + git -C bare.git repack -ad 2>stderr && + test_must_be_empty stderr && find bare.git/objects/pack/ -type f -name "*.bitmap" >actual && test_must_be_empty actual ' |