diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:26 -0700 |
| commit | 5dc36a5888a7063ff4536c9ea50eb0557bfef627 (patch) | |
| tree | 2573d7119c79c7b4abdd3c59f07b9ccbef442c4f /builtin-verify-pack.c | |
| parent | f0df1293acdba9513cae17e2c63b4169f1347371 (diff) | |
| parent | 39836a2e3cc38735d532a08465774194e5099daf (diff) | |
| download | git-5dc36a5888a7063ff4536c9ea50eb0557bfef627.tar.gz git-5dc36a5888a7063ff4536c9ea50eb0557bfef627.tar.xz | |
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3:
verify-pack -v: do not report "chain length 0"
t5510: harden the way verify-pack is used
Diffstat (limited to 'builtin-verify-pack.c')
| -rw-r--r-- | builtin-verify-pack.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/builtin-verify-pack.c b/builtin-verify-pack.c index 0ee0a9af6..a18df04cf 100644 --- a/builtin-verify-pack.c +++ b/builtin-verify-pack.c @@ -7,10 +7,13 @@ static void show_pack_info(struct packed_git *p) { - uint32_t nr_objects, i, chain_histogram[MAX_CHAIN+1]; + uint32_t nr_objects, i; + int cnt; + unsigned long chain_histogram[MAX_CHAIN+1], baseobjects; nr_objects = p->num_objects; memset(chain_histogram, 0, sizeof(chain_histogram)); + baseobjects = 0; for (i = 0; i < nr_objects; i++) { const unsigned char *sha1; @@ -29,9 +32,11 @@ static void show_pack_info(struct packed_git *p) &delta_chain_length, base_sha1); printf("%s ", sha1_to_hex(sha1)); - if (!delta_chain_length) + if (!delta_chain_length) { printf("%-6s %lu %lu %"PRIuMAX"\n", type, size, store_size, (uintmax_t)offset); + baseobjects++; + } else { printf("%-6s %lu %lu %"PRIuMAX" %u %s\n", type, size, store_size, (uintmax_t)offset, @@ -43,15 +48,21 @@ static void show_pack_info(struct packed_git *p) } } - for (i = 0; i <= MAX_CHAIN; i++) { - if (!chain_histogram[i]) + if (baseobjects) + printf("non delta: %lu object%s\n", + baseobjects, baseobjects > 1 ? "s" : ""); + + for (cnt = 1; cnt <= MAX_CHAIN; cnt++) { + if (!chain_histogram[cnt]) continue; - printf("chain length = %"PRIu32": %"PRIu32" object%s\n", i, - chain_histogram[i], chain_histogram[i] > 1 ? "s" : ""); + printf("chain length = %d: %lu object%s\n", cnt, + chain_histogram[cnt], + chain_histogram[cnt] > 1 ? "s" : ""); } if (chain_histogram[0]) - printf("chain length > %d: %"PRIu32" object%s\n", MAX_CHAIN, - chain_histogram[0], chain_histogram[0] > 1 ? "s" : ""); + printf("chain length > %d: %lu object%s\n", MAX_CHAIN, + chain_histogram[0], + chain_histogram[0] > 1 ? "s" : ""); } static int verify_one_pack(const char *path, int verbose) |