From: Jeff King <peff@peff.net>
Date: Fri, 20 Nov 2015 11:55:34 +0000 (-0500)
Subject: Merge branch 'dk/gc-idx-wo-pack'
X-Git-Tag: v2.7.0-rc0~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/45014beac004a610938a265698605c18ab126087?ds=inline;hp=--cc

Merge branch 'dk/gc-idx-wo-pack'

Having a leftover .idx file without corresponding .pack file in
the repository hurts performance; "git gc" learned to prune them.

* dk/gc-idx-wo-pack:
gc: remove garbage .idx files from pack dir
t5304: test cleaning pack garbage
prepare_packed_git(): refactor garbage reporting in pack directory
---

45014beac004a610938a265698605c18ab126087
diff --cc builtin/gc.c
index df3e454447,203265db76..c583aad6ec
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@@ -43,9 -42,37 +43,25 @@@ static struct argv_array prune = ARGV_A
  static struct argv_array prune_worktrees = ARGV_ARRAY_INIT;
  static struct argv_array rerere = ARGV_ARRAY_INIT;
  
 -static char *pidfile;
 -
 -static void remove_pidfile(void)
 -{
 -	if (pidfile)
 -		unlink(pidfile);
 -}
 -
 -static void remove_pidfile_on_signal(int signo)
 -{
 -	remove_pidfile();
 -	sigchain_pop(signo);
 -	raise(signo);
 -}
 +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)
  {
  	if (git_config_get_string_const(key, output))