diff options
author | Derrick Stolee <dstolee@microsoft.com> | 2021-12-20 14:48:10 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-12-20 19:58:31 (GMT) |
commit | e4d0c11c04ec3c28922168844ae2694e0d015b4e (patch) | |
tree | ffb8922a1c92f61deb456b201a6337b029ebeaf3 /builtin/repack.c | |
parent | e9d7761bb94f20acc98824275e317fa82436c25d (diff) | |
download | git-e4d0c11c04ec3c28922168844ae2694e0d015b4e.zip git-e4d0c11c04ec3c28922168844ae2694e0d015b4e.tar.gz git-e4d0c11c04ec3c28922168844ae2694e0d015b4e.tar.bz2 |
repack: respect kept objects with '--write-midx -b'
Historically, we needed a single packfile in order to have reachability
bitmaps. This introduced logic that when 'git repack' had a '-b' option
that we should stop sending the '--honor-pack-keep' option to the 'git
pack-objects' child process, ensuring that we create a packfile
containing all reachable objects.
In the world of multi-pack-index bitmaps, we no longer need to repack
all objects into a single pack to have valid bitmaps. Thus, we should
continue sending the '--honor-pack-keep' flag to 'git pack-objects'.
The fix is very simple: only disable the flag when writing bitmaps but
also _not_ writing the multi-pack-index.
This opens the door to new repacking strategies that might want to keep
some historical set of objects in a stable pack-file while only
repacking more recent objects.
To test, create a new 'test_subcommand_inexact' helper that is more
flexible than 'test_subcommand'. This allows us to look for the
--honor-pack-keep flag without over-indexing on the exact set of
arguments.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/repack.c')
-rw-r--r-- | builtin/repack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index 0b2d1e5..3c0346f 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -691,7 +691,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) write_bitmaps = 0; } if (pack_kept_objects < 0) - pack_kept_objects = write_bitmaps > 0; + pack_kept_objects = write_bitmaps > 0 && !write_midx; if (write_bitmaps && !(pack_everything & ALL_INTO_ONE) && !write_midx) die(_(incremental_bitmap_conflict_error)); |