From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Mar 2013 21:02:34 +0000 (-0700)
Subject: Merge branch 'nd/count-garbage'
X-Git-Tag: v1.8.3-rc0~205
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f5715de54a2237025a74704cb41f5404c743a2c3?ds=inline;hp=-c

Merge branch 'nd/count-garbage'

"git count-objects -v" did not count leftover temporary packfiles
and other kinds of garbage.

* nd/count-garbage:
count-objects: report how much disk space taken by garbage files
count-objects: report garbage files in pack directory too
sha1_file: reorder code in prepare_packed_git_one()
git-count-objects.txt: describe each line in -v output
---

f5715de54a2237025a74704cb41f5404c743a2c3
diff --combined cache.h
index 6818d87fa0,82af219e3e..c56315ccc3
--- a/cache.h
+++ b/cache.h
@@@ -1017,8 -1017,7 +1017,8 @@@ struct ref 
  		force:1,
  		forced_update:1,
  		merge:1,
 -		deletion:1;
 +		deletion:1,
 +		matched:1;
  	enum {
  		REF_STATUS_NONE = 0,
  		REF_STATUS_OK,
@@@ -1058,6 -1057,9 +1058,9 @@@ extern const char *parse_feature_value(
  
  extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
  
+ /* A hook for count-objects to report invalid files in pack directory */
+ extern void (*report_garbage)(const char *desc, const char *path);
+ 
  extern void prepare_packed_git(void);
  extern void reprepare_packed_git(void);
  extern void install_packed_git(struct packed_git *pack);