builtin/worktree.c: let parse-options parse subcommands
'git worktree' parses its subcommands with a long list of 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>
SZEDER Gábor committed
Aug 19, 2022 at 18:04 UTC
398c4ff582646b099eb1f3b14a525dfe5eeb5420
2 files changed
+13
-20
builtin/worktree.c
+12
-19
@@ -1112,31 +1112,24 @@ static int repair(int ac, const char **av, const char *prefix)
1112
1113
int cmd_worktree(int ac, const char **av, const char *prefix)
1114
{
1115
+ parse_opt_subcommand_fn *fn = NULL;
1116
struct option options[] = {
1117
+ OPT_SUBCOMMAND("add", &fn, add),
1118
+ OPT_SUBCOMMAND("prune", &fn, prune),
1119
+ OPT_SUBCOMMAND("list", &fn, list),
1120
+ OPT_SUBCOMMAND("lock", &fn, lock_worktree),
1121
+ OPT_SUBCOMMAND("unlock", &fn, unlock_worktree),
1122
+ OPT_SUBCOMMAND("move", &fn, move_worktree),
1123
+ OPT_SUBCOMMAND("remove", &fn, remove_worktree),
1124
+ OPT_SUBCOMMAND("repair", &fn, repair),
1125
OPT_END()
1126
};
1127
1128
git_config(git_worktree_config, NULL);
1129
1121
- if (ac < 2)
1122
- usage_with_options(worktree_usage, options);
1130
if (!prefix)
1131
prefix = "";
1125
- if (!strcmp(av[1], "add"))
1126
- return add(ac - 1, av + 1, prefix);
1127
- if (!strcmp(av[1], "prune"))
1128
- return prune(ac - 1, av + 1, prefix);
1129
- if (!strcmp(av[1], "list"))
1130
- return list(ac - 1, av + 1, prefix);
1131
- if (!strcmp(av[1], "lock"))
1132
- return lock_worktree(ac - 1, av + 1, prefix);
1133
- if (!strcmp(av[1], "unlock"))
1134
- return unlock_worktree(ac - 1, av + 1, prefix);
1135
- if (!strcmp(av[1], "move"))
1136
- return move_worktree(ac - 1, av + 1, prefix);
1137
- if (!strcmp(av[1], "remove"))
1138
- return remove_worktree(ac - 1, av + 1, prefix);
1139
- if (!strcmp(av[1], "repair"))
1140
- return repair(ac - 1, av + 1, prefix);
1141
- usage_with_options(worktree_usage, options);
1132
+
1133
+ ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
1134
+ return fn(ac, av, prefix);
1135
}
git.c
+1
-1
@@ -627,7 +627,7 @@ static struct cmd_struct commands[] = {
627
{ "verify-tag", cmd_verify_tag, RUN_SETUP },
628
{ "version", cmd_version },
629
{ "whatchanged", cmd_whatchanged, RUN_SETUP },
630
- { "worktree", cmd_worktree, RUN_SETUP | NO_PARSEOPT },
630
+ { "worktree", cmd_worktree, RUN_SETUP },
631
{ "write-tree", cmd_write_tree, RUN_SETUP },
632
};
633