rebase: fold git-rebase--common into the -p backend

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 2633efd95d01cd2d3440b203985eab997941a5f6..72dfd3dadc7bf8037d4bd11d24aabca6a56a5fa8 100644 (file)
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -3,9 +3,10 @@
 #include "config.h"
 #include "parse-options.h"
 #include "midx.h"
+#include "trace2.h"
 
 static char const * const builtin_multi_pack_index_usage[] = {
-       N_("git multi-pack-index [--object-dir=<dir>] write"),
+       N_("git multi-pack-index [--object-dir=<dir>] (write|verify)"),
        NULL
 };
 
@@ -40,8 +41,12 @@ int cmd_multi_pack_index(int argc, const char **argv,
                return 1;
        }
 
+       trace2_cmd_mode(argv[0]);
+
        if (!strcmp(argv[0], "write"))
                return write_midx_file(opts.object_dir);
+       if (!strcmp(argv[0], "verify"))
+               return verify_midx_file(the_repository, opts.object_dir);
 
        die(_("unrecognized verb: %s"), argv[0]);
 }