repack: die on incremental + write-bitmap-index

novalis · gitster · commit 1c409a705cb3 · 2016-12-29T13:45:37.000-08:00
The bitmap index only works for single packs, so requesting an
incremental repack with bitmap indexes makes no sense.

Signed-off-by: David Turner &lt;dturner@twosigma.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/repack.c b/builtin/repack.c
@@ -18,6 +18,12 @@ static const char *const git_repack_usage[] = {
 	NULL
 };
 
+static const char incremental_bitmap_conflict_error[] = N_(
+"Incremental repacks are incompatible with bitmap indexes.  Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+);
+
+
 static int repack_config(const char *var, const char *value, void *cb)
 {
 	if (!strcmp(var, "repack.usedeltabaseoffset")) {
@@ -206,6 +212,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	if (pack_kept_objects < 0)
 		pack_kept_objects = write_bitmaps;
 
+	if (write_bitmaps && !(pack_everything & ALL_INTO_ONE))
+		die(_(incremental_bitmap_conflict_error));
+
 	packdir = mkpathdup("%s/pack", get_object_directory());
 	packtmp = mkpathdup("%s/.tmp-%d-pack", packdir, (int)getpid());
 
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
@@ -105,12 +105,10 @@ test_expect_success 'fetch (partial bitmap)' '
 	test_cmp expect actual
 '
 
-test_expect_success 'incremental repack cannot create bitmaps' '
+test_expect_success 'incremental repack fails when bitmaps are requested' '
 	test_commit more-1 &&
-	find .git/objects/pack -name "*.bitmap" >expect &&
-	git repack -d &&
-	find .git/objects/pack -name "*.bitmap" >actual &&
-	test_cmp expect actual
+	test_must_fail git repack -d 2>err &&
+	test_i18ngrep "Incremental repacks are incompatible with bitmap" err
 '
 
 test_expect_success 'incremental repack can disable bitmaps' '

Original file line number	Diff line number	Diff line change
`@@ -105,12 +105,10 @@ test_expect_success 'fetch (partial bitmap)' '`
`105`	`105`	`test_cmp expect actual`
`106`	`106`	`'`
`107`	`107`
`108`		`-test_expect_success 'incremental repack cannot create bitmaps' '`
	`108`	`+test_expect_success 'incremental repack fails when bitmaps are requested' '`
`109`	`109`	`test_commit more-1 &&`
`110`		`- find .git/objects/pack -name "*.bitmap" >expect &&`
`111`		`- git repack -d &&`
`112`		`- find .git/objects/pack -name "*.bitmap" >actual &&`
`113`		`- test_cmp expect actual`
	`110`	`+ test_must_fail git repack -d 2>err &&`
	`111`	`+ test_i18ngrep "Incremental repacks are incompatible with bitmap" err`
`114`	`112`	`'`
`115`	`113`
`116`	`114`	`test_expect_success 'incremental repack can disable bitmaps' '`