diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-30 17:17:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 22:33:47 -0700 |
| commit | ad8c80a58f7bf8f7d5d34794355e5540cd7b3218 (patch) | |
| tree | a8f07fbbf3cc86876ba4ec8f534592294b57fa1c /pack-check.c | |
| parent | f3bf92240956241e6b21e80a1c281ec7716b9f23 (diff) | |
| download | git-ad8c80a58f7bf8f7d5d34794355e5540cd7b3218.tar.gz | |
[PATCH] Show more details of packfile with verify-pack -v.
This implements show_pack_info() function used in verify-pack
command when -v flag is used to obtain something like
unpack-objects used to give when it was first written.
It shows the following for each non-deltified object found in
the pack:
SHA1 type size offset
For deltified objects, it shows this instead:
SHA1 type size offset depth base_sha1
In order to get the output in the order that appear in the pack
file for debugging purposes, you can do this:
$ git-verify-pack -v packfile | sort -n -k 4,4
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'pack-check.c')
| -rw-r--r-- | pack-check.c | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/pack-check.c b/pack-check.c index 9c723972b7..916257f418 100644 --- a/pack-check.c +++ b/pack-check.c @@ -72,7 +72,36 @@ static int verify_packfile(struct packed_git *p) static void show_pack_info(struct packed_git *p) { - /* Next round */ + struct pack_header *hdr; + int nr_objects, i; + + hdr = p->pack_base; + nr_objects = ntohl(hdr->hdr_entries); + + for (i = 0; i < nr_objects; i++) { + unsigned char sha1[20], base_sha1[20]; + struct pack_entry e; + char type[20]; + unsigned long size; + unsigned long store_size; + int delta_chain_length; + + if (nth_packed_object_sha1(p, i, sha1)) + die("internal error pack-check nth-packed-object"); + if (!find_pack_entry_one(sha1, &e, p)) + die("internal error pack-check find-pack-entry-one"); + + packed_object_info_detail(&e, type, &size, &store_size, + &delta_chain_length, + base_sha1); + printf("%s ", sha1_to_hex(sha1)); + if (!delta_chain_length) + printf("%-6s %lu %u\n", type, size, e.offset); + else + printf("%-6s %lu %u %d %s\n", type, size, e.offset, + delta_chain_length, sha1_to_hex(base_sha1)); + } + } int verify_pack(struct packed_git *p, int verbose) @@ -103,7 +132,9 @@ int verify_pack(struct packed_git *p, int verbose) if (ret) printf("%s: bad\n", p->pack_name); else { + use_packed_git(p); show_pack_info(p); + unuse_packed_git(p); printf("%s: ok\n", p->pack_name); } } |