Merge branch 'maint'

diff --git a/builtin-verify-pack.c b/builtin-verify-pack.c
index 222c39e7edc85c8356db7821416574f60316422d..25a29f11a4b9642c1bd367b81779d8f09ae04604 100644 (file)
--- a/builtin-verify-pack.c
+++ b/builtin-verify-pack.c
@@ -1,7 +1,7 @@
 #include "builtin.h"
 #include "cache.h"
 #include "pack.h"
-
+#include "pack-revindex.h"
 
 #define MAX_CHAIN 50
 
@@ -46,11 +46,11 @@ static void show_pack_info(struct packed_git *p)
        for (i = 0; i <= MAX_CHAIN; i++) {
                if (!chain_histogram[i])
                        continue;
-               printf("chain length = %d: %d object%s\n", i,
+               printf("chain length = %"PRIu32": %"PRIu32" object%s\n", i,
                       chain_histogram[i], chain_histogram[i] > 1 ? "s" : "");
        }
        if (chain_histogram[0])
-               printf("chain length > %d: %d object%s\n", MAX_CHAIN,
+               printf("chain length > %d: %"PRIu32" object%s\n", MAX_CHAIN,
                       chain_histogram[0], chain_histogram[0] > 1 ? "s" : "");
 }
 
@@ -129,6 +129,7 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
                else {
                        if (verify_one_pack(argv[1], verbose))
                                err = 1;
+                       discard_revindex();
                        nothing_done = 0;
                }
                argc--; argv++;