Revision 7ff024e7b3d576fc265dbdd1a7bd3dcc6dde1eb6 authored by Jeff King on 31 July 2019, 05:40:56 UTC, committed by Junio C Hamano on 31 July 2019, 20:26:25 UTC
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>
1 parent 2557501
History
File Mode Size
default.c -rw-r--r-- 4.2 KB
default.h -rw-r--r-- 160 bytes
skipping.c -rw-r--r-- 5.9 KB
skipping.h -rw-r--r-- 163 bytes

back to top