diff options
| author | Nicolas Pitre <nico@cam.org> | 2008-02-28 05:25:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-01 09:44:46 (GMT) |
| commit | 5f4347bba39ddb147b06913ac263fc46954d2d0b (patch) | |
| tree | 14625a65b23ed1892c9c8de5c86f02e1523fe5d0 | |
| parent | 70f5d5d31cbf0ba273083805124ad67135142527 (diff) | |
| download | git-5f4347bba39ddb147b06913ac263fc46954d2d0b.zip git-5f4347bba39ddb147b06913ac263fc46954d2d0b.tar.gz git-5f4347bba39ddb147b06913ac263fc46954d2d0b.tar.bz2 | |
add storage size output to 'git verify-pack -v'
This can possibly break external scripts that depend on the previous
output, but those script can't possibly be critical to Git usage, and
fixing them should be trivial.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-verify-pack.txt | 4 | ||||
| -rwxr-xr-x | contrib/stats/packinfo.pl | 2 | ||||
| -rw-r--r-- | pack-check.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt index db019a2..ba2a157 100644 --- a/Documentation/git-verify-pack.txt +++ b/Documentation/git-verify-pack.txt @@ -32,11 +32,11 @@ OUTPUT FORMAT ------------- When specifying the -v option the format used is: - SHA1 type size offset-in-packfile + SHA1 type size size-in-pack-file offset-in-packfile for objects that are not deltified in the pack, and - SHA1 type size offset-in-packfile depth base-SHA1 + SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1 for objects that are deltified. diff --git a/contrib/stats/packinfo.pl b/contrib/stats/packinfo.pl index aab501e..f4a7b62 100755 --- a/contrib/stats/packinfo.pl +++ b/contrib/stats/packinfo.pl @@ -93,7 +93,7 @@ my %depths; my @depths; while (<STDIN>) { - my ($sha1, $type, $size, $offset, $depth, $parent) = split(/\s+/, $_); + my ($sha1, $type, $size, $space, $offset, $depth, $parent) = split(/\s+/, $_); next unless ($sha1 =~ /^[0-9a-f]{40}$/); $depths{$sha1} = $depth || 0; push(@depths, $depth || 0); diff --git a/pack-check.c b/pack-check.c index ae25685..0f8ad2c 100644 --- a/pack-check.c +++ b/pack-check.c @@ -128,11 +128,11 @@ static void show_pack_info(struct packed_git *p) base_sha1); printf("%s ", sha1_to_hex(sha1)); if (!delta_chain_length) - printf("%-6s %lu %"PRIuMAX"\n", - type, size, (uintmax_t)offset); + printf("%-6s %lu %lu %"PRIuMAX"\n", + type, size, store_size, (uintmax_t)offset); else { - printf("%-6s %lu %"PRIuMAX" %u %s\n", - type, size, (uintmax_t)offset, + printf("%-6s %lu %lu %"PRIuMAX" %u %s\n", + type, size, store_size, (uintmax_t)offset, delta_chain_length, sha1_to_hex(base_sha1)); if (delta_chain_length <= MAX_CHAIN) chain_histogram[delta_chain_length]++; |