Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint

gitster · gitster · commit ebc2e5a593ce · 2014-10-29T10:35:17.000-07:00
* jk/pack-objects-no-bitmap-when-splitting:
  pack-objects: turn off bitmaps when we split packs
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -812,6 +812,7 @@ static void write_pack_file(void)
 			fixup_pack_header_footer(fd, sha1, pack_tmp_name,
 						 nr_written, sha1, offset);
 			close(fd);
+			write_bitmap_index = 0;
 		}
 
 		if (!pack_to_stdout) {
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
@@ -170,4 +170,13 @@ test_expect_success JGIT 'jgit can read our bitmaps' '
 	)
 '
 
+test_expect_success 'splitting packs does not generate bogus bitmaps' '
+	test-genrandom foo $((1024 * 1024)) >rand &&
+	git add rand &&
+	git commit -m "commit with big file" &&
+	git -c pack.packSizeLimit=500k repack -adb &&
+	git init --bare no-bitmaps.git &&
+	git -C no-bitmaps.git fetch .. HEAD
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -812,6 +812,7 @@ static void write_pack_file(void)`
`812`	`812`	`fixup_pack_header_footer(fd, sha1, pack_tmp_name,`
`813`	`813`	`nr_written, sha1, offset);`
`814`	`814`	`close(fd);`
	`815`	`+ write_bitmap_index = 0;`
`815`	`816`	`}`
`816`	`817`
`817`	`818`	`if (!pack_to_stdout) {`
Original file line number	Diff line number	Diff line change
`@@ -170,4 +170,13 @@ test_expect_success JGIT 'jgit can read our bitmaps' '`
`170`	`170`	`)`
`171`	`171`	`'`
`172`	`172`
	`173`	`+test_expect_success 'splitting packs does not generate bogus bitmaps' '`
	`174`	`+ test-genrandom foo $((1024 * 1024)) >rand &&`
	`175`	`+ git add rand &&`
	`176`	`+ git commit -m "commit with big file" &&`
	`177`	`+ git -c pack.packSizeLimit=500k repack -adb &&`
	`178`	`+ git init --bare no-bitmaps.git &&`
	`179`	`+ git -C no-bitmaps.git fetch .. HEAD`
	`180`	`+'`
	`181`	`+`
`173`	`182`	`test_done`