diff options
| author | David Turner <dturner@twosigma.com> | 2016-12-28 22:45:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-29 21:45:35 (GMT) |
| commit | bdf56de896b48d6fe3ad90e92138b5fd6579748d (patch) | |
| tree | 1be4c69a1fa9b5222cd4cd2ba8a1d27626a394b7 /t | |
| parent | c3808ca6982b0ad7ee9b87eca9b50b9a24ec08b0 (diff) | |
| download | git-bdf56de896b48d6fe3ad90e92138b5fd6579748d.zip git-bdf56de896b48d6fe3ad90e92138b5fd6579748d.tar.gz git-bdf56de896b48d6fe3ad90e92138b5fd6579748d.tar.bz2 | |
auto gc: don't write bitmaps for incremental repacks
When git gc --auto does an incremental repack of loose objects, we do
not expect to be able to write a bitmap; it is very likely that
objects in the new pack will have references to objects outside of the
pack. So we shouldn't try to write a bitmap, because doing so will
likely issue a warning.
This warning was making its way into gc.log. When the gc.log was
present, future auto gc runs would refuse to run.
Patch by Jeff King.
Bug report, test, and commit message by David Turner.
Signed-off-by: David Turner <dturner@twosigma.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6500-gc.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index 5d7d414..1762dfa 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -43,4 +43,29 @@ test_expect_success 'gc is not aborted due to a stale symref' ' ) ' +test_expect_success 'auto gc with too many loose objects does not attempt to create bitmaps' ' + test_config gc.auto 3 && + test_config gc.autodetach false && + test_config pack.writebitmaps true && + # We need to create two object whose sha1s start with 17 + # since this is what git gc counts. As it happens, these + # two blobs will do so. + test_commit 263 && + test_commit 410 && + # Our first gc will create a pack; our second will create a second pack + git gc --auto && + ls .git/objects/pack | sort >existing_packs && + test_commit 523 && + test_commit 790 && + + git gc --auto 2>err && + test_i18ngrep ! "^warning:" err && + ls .git/objects/pack/ | sort >post_packs && + comm -1 -3 existing_packs post_packs >new && + comm -2 -3 existing_packs post_packs >del && + test_line_count = 0 del && # No packs are deleted + test_line_count = 2 new # There is one new pack and its .idx +' + + test_done |