mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 03:14:02 +01:00
Code

[PATCH] Show more details of packfile with verify-pack -v.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-06-30 17:17:20 -07:00 committed by Linus Torvalds
parent f3bf922409
commit ad8c80a58f
3 changed files with 84 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -266,5 +266,6 @@ extern int num_packed_objects(const struct packed_git *p);
extern int nth_packed_object_sha1(const struct packed_git *, int, unsigned char*);
extern int find_pack_entry_one(const unsigned char *, struct pack_entry *, struct packed_git *);
extern void *unpack_entry_gently(struct pack_entry *, char *, unsigned long *);
extern void packed_object_info_detail(struct pack_entry *, char *, unsigned long *, unsigned long *, int *, unsigned char *);
#endif /* CACHE_H */

33
pack-check.c
View File

@ -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);
}
}

51
sha1_file.c
View File

@ -704,6 +704,57 @@ static unsigned long unpack_object_header(struct packed_git *p, unsigned long of
return offset;
}
void packed_object_info_detail(struct pack_entry *e,
char *type,
unsigned long *size,
unsigned long *store_size,
int *delta_chain_length,
unsigned char *base_sha1)
{
struct packed_git *p = e->p;
unsigned long offset, left;
unsigned char *pack;
enum object_type kind;
offset = unpack_object_header(p, e->offset, &kind, size);
pack = p->pack_base + offset;
left = p->pack_size - offset;
if (kind != OBJ_DELTA)
*delta_chain_length = 0;
else {
int chain_length = 0;
memcpy(base_sha1, pack, 20);
do {
struct pack_entry base_ent;
unsigned long junk;
find_pack_entry_one(pack, &base_ent, p);
offset = unpack_object_header(p, base_ent.offset,
&kind, &junk);
pack = p->pack_base + offset;
chain_length++;
} while (kind == OBJ_DELTA);
*delta_chain_length = chain_length;
}
switch (kind) {
case OBJ_COMMIT:
strcpy(type, "commit");
break;
case OBJ_TREE:
strcpy(type, "tree");
break;
case OBJ_BLOB:
strcpy(type, "blob");
break;
case OBJ_TAG:
strcpy(type, "tag");
break;
default:
die("corrupted pack file");
}
*store_size = 0; /* notyet */
}
static int packed_object_info(struct pack_entry *entry,
char *type, unsigned long *sizep)
{