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
.gitignore -rw-r--r-- 22 bytes
Makefile -rw-r--r-- 1.7 KB
branches-- -rw-r--r-- 47 bytes
hooks--applypatch-msg.sample -rwxr-xr-x 478 bytes
hooks--commit-msg.sample -rwxr-xr-x 896 bytes
hooks--fsmonitor-watchman.sample -rwxr-xr-x 3.2 KB
hooks--post-update.sample -rwxr-xr-x 189 bytes
hooks--pre-applypatch.sample -rwxr-xr-x 424 bytes
hooks--pre-commit.sample -rwxr-xr-x 1.6 KB
hooks--pre-push.sample -rwxr-xr-x 1.3 KB
hooks--pre-rebase.sample -rwxr-xr-x 4.8 KB
hooks--pre-receive.sample -rwxr-xr-x 544 bytes
hooks--prepare-commit-msg.sample -rwxr-xr-x 1.5 KB
hooks--update.sample -rwxr-xr-x 3.5 KB
info--exclude -rw-r--r-- 240 bytes
this--description -rw-r--r-- 73 bytes

back to top