gc: remove garbage .idx files from pack dir
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e6d65c9a47
commit
478f34d2b6
21
builtin/gc.c
21
builtin/gc.c
@ -57,6 +57,22 @@ static void remove_pidfile_on_signal(int signo)
|
||||
raise(signo);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
if (git_config_get_string_const(key, output))
|
||||
@ -372,6 +388,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."));
|
||||
|
@ -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 &&
|
||||
|
Loading…
Reference in New Issue
Block a user