Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / builtin / verify-pack.c

diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c
index c2a1a5c5048412abaa545862dbd0f3dd93338dc5..05c52135946b77ba6014f69b203d3e979df94ffd 100644 (file)
--- a/builtin/verify-pack.c
+++ b/builtin/verify-pack.c
@@ -7,21 +7,26 @@
 #define VERIFY_PACK_VERBOSE 01
 #define VERIFY_PACK_STAT_ONLY 02
 
-static int verify_one_pack(const char *path, unsigned int flags)
+static int verify_one_pack(const char *path, unsigned int flags, const char *hash_algo)
 {
        struct child_process index_pack = CHILD_PROCESS_INIT;
-       const char *argv[] = {"index-pack", NULL, NULL, NULL };
+       struct strvec *argv = &index_pack.args;
        struct strbuf arg = STRBUF_INIT;
        int verbose = flags & VERIFY_PACK_VERBOSE;
        int stat_only = flags & VERIFY_PACK_STAT_ONLY;
        int err;
 
+       strvec_push(argv, "index-pack");
+
        if (stat_only)
-               argv[1] = "--verify-stat-only";
+               strvec_push(argv, "--verify-stat-only");
        else if (verbose)
-               argv[1] = "--verify-stat";
+               strvec_push(argv, "--verify-stat");
        else
-               argv[1] = "--verify";
+               strvec_push(argv, "--verify");
+
+       if (hash_algo)
+               strvec_pushf(argv, "--object-format=%s", hash_algo);
 
        /*
         * In addition to "foo.pack" we accept "foo.idx" and "foo";
@@ -31,9 +36,8 @@ static int verify_one_pack(const char *path, unsigned int flags)
        if (strbuf_strip_suffix(&arg, ".idx") ||
            !ends_with(arg.buf, ".pack"))
                strbuf_addstr(&arg, ".pack");
-       argv[2] = arg.buf;
+       strvec_push(argv, arg.buf);
 
-       index_pack.argv = argv;
        index_pack.git_cmd = 1;
 
        err = run_command(&index_pack);
@@ -60,12 +64,15 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
 {
        int err = 0;
        unsigned int flags = 0;
+       const char *object_format = NULL;
        int i;
        const struct option verify_pack_options[] = {
                OPT_BIT('v', "verbose", &flags, N_("verbose"),
                        VERIFY_PACK_VERBOSE),
                OPT_BIT('s', "stat-only", &flags, N_("show statistics only"),
                        VERIFY_PACK_STAT_ONLY),
+               OPT_STRING(0, "object-format", &object_format, N_("hash"),
+                          N_("specify the hash algorithm to use")),
                OPT_END()
        };
 
@@ -75,7 +82,7 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
        if (argc < 1)
                usage_with_options(verify_pack_usage, verify_pack_options);
        for (i = 0; i < argc; i++) {
-               if (verify_one_pack(argv[i], flags))
+               if (verify_one_pack(argv[i], flags, object_format))
                        err = 1;
        }