Merge branch 'nd/count-garbage' into next
commitcf6fa47af16531094753ea83585334a380220e6c
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:02 +0000 (19 15:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:02 +0000 (19 15:57 -0700)
tree497ddc11b376bdd95ea1fe681bb90bcf3ed439b1
parentd5363f6996cb3cd4a74efa30f3f8ff91922b11a7
parent1a20dd49f8c4e6c62080f267ca77b357cb61be8e
Merge branch 'nd/count-garbage' into next

"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
cache.h