[PATCH 3/3] gc: Remove garbage .idx files from pack dir
- From
Doug Kelly <dougk.ff7@gmail.com>
- Date
- Nov 4, 2015, 03:05 UTC
- Message-ID
- <1446606308-1668-3-git-send-email-dougk.ff7@gmail.com>
- In-Reply-To
- <1446606308-1668-1-git-send-email-dougk.ff7@gmail.com>
Add a custom report_garbage handler to collect and remove garbage .idx files from the pack directory.
Signed-off-by: Doug Kelly <dougk.ff7@gmail.com> --- builtin/gc.c | 20 ++++++++++++++++++++ t/t5304-prune.sh | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/builtin/gc.c b/builtin/gc.c index df3e454..668f975 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -45,6 +45,21 @@ static struct argv_array rerere = ARGV_ARRAY_INIT; static struct tempfile pidfile; static struct lock_file log_lock; +static struct string_list pack_garbage = STRING_LIST_INIT_DUP; + +static void clean_pack_garbage(void) +{ + int i; + for (i = 0; i < pack_garbage.nr; i++) + unlink_or_warn(pack_garbage.items[i].string); + string_list_clear(&pack_garbage, 0); +} + +static void report_pack_garbage(unsigned seen_bits, const char *path) +{ + if (seen_bits == PACKDIR_FILE_IDX) + string_list_append(&pack_garbage, path); +} static void git_config_date_string(const char *key, const char **output) { @@ -416,6 +431,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix) if (run_command_v_opt(rerere.argv, RUN_GIT_CMD)) return error(FAILED_RUN, rerere.argv[0]); + report_garbage = report_pack_garbage; + reprepare_packed_git(); + if (pack_garbage.nr > 0) + clean_pack_garbage(); + if (auto_gc && too_many_loose_objects()) warning(_("There are too many unreachable loose objects; " "run 'git prune' to remove them.")); diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index 0297515..def203c 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -245,7 +245,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.5.1