Merge branch 'ap/strbuf-humanize'

Teach "--human-readable" aka "-H" option to "git count-objects" to
show various large numbers in Ki/Mi/GiB scaled as necessary.

* ap/strbuf-humanize:
  count-objects: add -H option to humanize sizes
  strbuf: create strbuf_humanise_bytes() to show byte sizes
This commit is contained in:
Junio C Hamano
2013-04-19 13:31:26 -07:00
6 changed files with 86 additions and 40 deletions

View File

@ -8,7 +8,7 @@ git-count-objects - Count unpacked number of objects and their disk consumption
SYNOPSIS
--------
[verse]
'git count-objects' [-v]
'git count-objects' [-v] [-H | --human-readable]
DESCRIPTION
-----------
@ -24,11 +24,11 @@ OPTIONS
+
count: the number of loose objects
+
size: disk space consumed by loose objects, in KiB
size: disk space consumed by loose objects, in KiB (unless -H is specified)
+
in-pack: the number of in-pack objects
+
size-pack: disk space consumed by the packs, in KiB
size-pack: disk space consumed by the packs, in KiB (unless -H is specified)
+
prune-packable: the number of loose objects that are also present in
the packs. These objects could be pruned using `git prune-packed`.
@ -36,7 +36,13 @@ the packs. These objects could be pruned using `git prune-packed`.
garbage: the number of files in object database that are not valid
loose objects nor valid packs
+
size-garbage: disk space consumed by garbage files, in KiB
size-garbage: disk space consumed by garbage files, in KiB (unless -H is
specified)
-H::
--human-readable::
Print sizes in human readable format
GIT
---

View File

@ -230,6 +230,11 @@ which can be used by the programmer of the callback as she sees fit.
destination. This is useful for literal data to be fed to either
strbuf_expand or to the *printf family of functions.
`strbuf_humanise_bytes`::
Append the given byte size as a human-readable string (i.e. 12.23 KiB,
3.50 MiB).
`strbuf_addf`::
Add a formatted string to the buffer.