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

diff --combined cache.h
index 6818d87fa033182c343164ace22fb21246db6a3b,82af219e3ea905ef48f1ba9f33399eb218eea223..c56315ccc3605654ff4a08a8b74cc8f25cfb2b41
--- 1/cache.h
--- 2/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);