[PATCH 3/3] gc: Clean garbage .bitmap files from pack dir
- From
Doug Kelly <dougk.ff7@gmail.com>
- Date
- Dec 19, 2015, 00:06 UTC
- Message-ID
- <1450483600-64091-4-git-send-email-dougk.ff7@gmail.com>
- In-Reply-To
- <1450483600-64091-1-git-send-email-dougk.ff7@gmail.com>
Similar to cleaning up excess .idx files, clean any garbage .bitmap files that are not otherwise associated with any .idx/.pack files.
Signed-off-by: Doug Kelly <dougk.ff7@gmail.com> --- builtin/gc.c | 12 ++++++++++-- t/t5304-prune.sh | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c index c583aad..7ddf071 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -58,8 +58,16 @@ static void clean_pack_garbage(void) static void report_pack_garbage(unsigned seen_bits, const char *path) { - if (seen_bits == PACKDIR_FILE_IDX) - string_list_append(&pack_garbage, path); + if (seen_bits & PACKDIR_FILE_IDX || + seen_bits & PACKDIR_FILE_BITMAP) { + const char *dot = strrchr(path, '.'); + if (dot) { + int baselen = dot - path + 1; + if (!strcmp(path+baselen, "idx") || + !strcmp(path+baselen, "bitmap")) + string_list_append(&pack_garbage, path); + } + } } static void git_config_date_string(const char *key, const char **output) diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index 4fa6e7a..9f9f263 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -257,7 +257,7 @@ EOF test_cmp expected actual ' -test_expect_failure 'clean pack garbage with gc' ' +test_expect_success 'clean pack garbage with gc' ' test_when_finished "rm -f .git/objects/pack/fake*" && test_when_finished "rm -f .git/objects/pack/foo*" && : >.git/objects/pack/foo.keep &&
-- 2.6.1