summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorDoug Kelly <dougk.ff7@gmail.com>2015-11-04 03:05:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-11-04 19:30:22 (GMT)
commit478f34d2b6ea13d5f56ecec04de7ca7ce18367c0 (patch)
treec42c51cc370555bc4fe5d978e6a9a3072182c16f /builtin/gc.c
parente6d65c9a47a0f245614d34246fe28782a6d2209b (diff)
downloadgit-478f34d2b6ea13d5f56ecec04de7ca7ce18367c0.zip
git-478f34d2b6ea13d5f56ecec04de7ca7ce18367c0.tar.gz
git-478f34d2b6ea13d5f56ecec04de7ca7ce18367c0.tar.bz2
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>
Diffstat (limited to 'builtin/gc.c')
-rw-r--r--builtin/gc.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index 4957c39..203265d 100644
--- a/builtin/gc.c
+++ b/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."));