@matheusbsbs / matheus-bagliano / commits / 64d3dc9468

repack: do not accidentally pack kept objects by default

Commit ee34a2b (repack: add `repack.packKeptObjects` config var, 2014-03-03) added a flag which could duplicate kept objects, but did not mean to turn it on by default. Instead, the option is tied by default to the decision to write bitmaps, like: if (pack_kept_objects < 0) pack_kept_objects = write_bitmap; after which we expect pack_kept_objects to be a boolean 0 or 1. However, that assignment neglects that write_bitmap is _also_ a tri-state with "-1" as the default, and with neither option given, we accidentally turn the option on. This patch is the minimal fix to restore the desired behavior for the default state. Further patches will fix the more complicated cases. Note the update to t7700. It failed to turn on bitmaps, meaning we were actually confirming the wrong behavior! Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 10, 2014 at 16:08 UTC 64d3dc94687bf4a8a422ab6d5cffcdb44315d49e
2 files changed +2 -2
builtin/repack.c
+1 -1
@@ -191,7 +191,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
191 git_repack_usage, 0);
192
193 if (pack_kept_objects < 0)
194 - pack_kept_objects = write_bitmap;
194 + pack_kept_objects = write_bitmap > 0;
195
196 packdir = mkpathdup("%s/pack", get_object_directory());
197 packtmp = mkpathdup("%s/.tmp-%d-pack", packdir, (int)getpid());
t/t7700-repack.sh
+1 -1
@@ -37,7 +37,7 @@ test_expect_success 'objects in packs marked .keep are not repacked' '
37
38 test_expect_success 'writing bitmaps can duplicate .keep objects' '
39 # build on $objsha1, $packsha1, and .keep state from previous
40 - git repack -Adl &&
40 + git repack -Adbl &&
41 test_when_finished "found_duplicate_object=" &&
42 for p in .git/objects/pack/*.idx; do
43 idx=$(basename $p)