commit: extract cleanup_mode functions to sequencer

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 6a7aa00cf2e7b1af5597e3cc53b55a14e03eed54..ae6e476ad567e57e5a1e308d7901b0a0c331640f 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
 };
 
@@ -32,16 +33,20 @@ int cmd_multi_pack_index(int argc, const char **argv,
                opts.object_dir = get_object_directory();
 
        if (argc == 0)
-               goto usage;
+               usage_with_options(builtin_multi_pack_index_usage,
+                                  builtin_multi_pack_index_options);
 
-       if (!strcmp(argv[0], "write")) {
-               if (argc > 1)
-                       goto usage;
+       if (argc > 1) {
+               die(_("too many arguments"));
+               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(opts.object_dir);
 
-usage:
-       usage_with_options(builtin_multi_pack_index_usage,
-                          builtin_multi_pack_index_options);
+       die(_("unrecognized verb: %s"), argv[0]);
 }