@matheusbsbs / matheus-bagliano / commits / 7ff024e7b3

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>

Jeff King committed Jul 31, 2019 at 01:40 UTC 7ff024e7b3d576fc265dbdd1a7bd3dcc6dde1eb6

2 files changed +4 -16

builtin/repack.c

+2 -15

@@ -89,17 +89,6 @@ static void remove_pack_on_signal(int signo)

89 raise(signo);

90 }

92 -static int has_pack_keep_file(void)

93 -{

94 - struct packed_git *p;

95 -

96 - for (p = get_all_packs(the_repository); p; p = p->next) {

97 - if (p->pack_keep)

98 - return 1;

99 - }

100 - return 0;

101 -}

102 -

92 /*

93 * Adds all packs hex strings to the fname list, which do not

94 * have a corresponding .keep file. These packs are not to

@@ -346,13 +335,11 @@ int cmd_repack(int argc, const char **argv, const char *prefix)

335

336 if (write_bitmaps < 0) {

337 if (!(pack_everything & ALL_INTO_ONE) ||

349 - !is_bare_repository() ||

350 - keep_pack_list.nr != 0 ||

351 - has_pack_keep_file())

338 + !is_bare_repository())

339 write_bitmaps = 0;

340 }

341 if (pack_kept_objects < 0)

355 - pack_kept_objects = !!write_bitmaps;

342 + pack_kept_objects = write_bitmaps > 0;

343

344 if (write_bitmaps && !(pack_everything & ALL_INTO_ONE))

345 die(_(incremental_bitmap_conflict_error));

t/t7700-repack.sh

+2 -1

@@ -245,7 +245,8 @@ test_expect_success 'no bitmaps created if .keep files present' '

245 keep=${pack%.pack}.keep &&

246 test_when_finished "rm -f \"\$keep\"" &&

247 >"$keep" &&

248 - git -C bare.git repack -ad &&

248 + git -C bare.git repack -ad 2>stderr &&

249 + test_must_be_empty stderr &&

250 find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&

251 test_must_be_empty actual

252 '