builtin/bundle.c: let parse-options parse subcommands

'git bundle' parses its subcommands with a couple of if-else if
statements.  parse-options has just learned to parse subcommands, so
let's use that facility instead, with the benefits of shorter code,
handling missing or unknown subcommands, and listing subcommands for
Bash completion.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/bundle.c b/builtin/bundle.c
index 2adad545a2e972221869703658e98be0c514d005..e80efce3a420a0371bd984102105b8a51af34df1 100644 (file)
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -195,30 +195,19 @@ cleanup:
 
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {
+       parse_opt_subcommand_fn *fn = NULL;
        struct option options[] = {
+               OPT_SUBCOMMAND("create", &fn, cmd_bundle_create),
+               OPT_SUBCOMMAND("verify", &fn, cmd_bundle_verify),
+               OPT_SUBCOMMAND("list-heads", &fn, cmd_bundle_list_heads),
+               OPT_SUBCOMMAND("unbundle", &fn, cmd_bundle_unbundle),
                OPT_END()
        };
-       int result;
 
        argc = parse_options(argc, argv, prefix, options, builtin_bundle_usage,
-               PARSE_OPT_STOP_AT_NON_OPTION);
+                            0);
 
        packet_trace_identity("bundle");
 
-       if (argc < 2)
-               usage_with_options(builtin_bundle_usage, options);
-
-       else if (!strcmp(argv[0], "create"))
-               result = cmd_bundle_create(argc, argv, prefix);
-       else if (!strcmp(argv[0], "verify"))
-               result = cmd_bundle_verify(argc, argv, prefix);
-       else if (!strcmp(argv[0], "list-heads"))
-               result = cmd_bundle_list_heads(argc, argv, prefix);
-       else if (!strcmp(argv[0], "unbundle"))
-               result = cmd_bundle_unbundle(argc, argv, prefix);
-       else {
-               error(_("Unknown subcommand: %s"), argv[0]);
-               usage_with_options(builtin_bundle_usage, options);
-       }
-       return result ? 1 : 0;
+       return !!fn(argc, argv, prefix);
 }