diff options
| -rw-r--r-- | builtin/repack.c | 6 | ||||
| -rwxr-xr-x | t/t7700-repack.sh | 18 |
2 files changed, 22 insertions, 2 deletions
diff --git a/builtin/repack.c b/builtin/repack.c index a02ef0dcdf..d6b6bb673b 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -10,6 +10,7 @@ static int delta_base_offset = 1; static int pack_kept_objects = -1; +static int write_bitmap = -1; static char *packdir, *packtmp; static const char *const git_repack_usage[] = { @@ -27,6 +28,10 @@ static int repack_config(const char *var, const char *value, void *cb) pack_kept_objects = git_config_bool(var, value); return 0; } + if (!strcmp(var, "pack.writebitmaps")) { + write_bitmap = git_config_bool(var, value); + return 0; + } return git_default_config(var, value, cb); } @@ -149,7 +154,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix) int no_update_server_info = 0; int quiet = 0; int local = 0; - int write_bitmap = -1; struct option builtin_repack_options[] = { OPT_BIT('a', NULL, &pack_everything, diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index f207b91f0a..e70b98358b 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -35,7 +35,7 @@ test_expect_success 'objects in packs marked .keep are not repacked' ' test -z "$found_duplicate_object" ' -test_expect_success 'writing bitmaps can duplicate .keep objects' ' +test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' ' # build on $objsha1, $packsha1, and .keep state from previous git repack -Adbl && test_when_finished "found_duplicate_object=" && @@ -51,6 +51,22 @@ test_expect_success 'writing bitmaps can duplicate .keep objects' ' test "$found_duplicate_object" = 1 ' +test_expect_success 'writing bitmaps via config can duplicate .keep objects' ' + # build on $objsha1, $packsha1, and .keep state from previous + git -c pack.writebitmaps=true repack -Adl && + test_when_finished "found_duplicate_object=" && + for p in .git/objects/pack/*.idx; do + idx=$(basename $p) + test "pack-$packsha1.idx" = "$idx" && continue + if git verify-pack -v $p | egrep "^$objsha1"; then + found_duplicate_object=1 + echo "DUPLICATE OBJECT FOUND" + break + fi + done && + test "$found_duplicate_object" = 1 +' + test_expect_success 'loose objects in alternate ODB are not repacked' ' mkdir alt_objects && echo `pwd`/alt_objects > .git/objects/info/alternates && |