builtin/multi-pack-index.c: don't enter bogus cmd_mode
Even before the recent refactoring, 'git multi-pack-index' calls 'trace2_cmd_mode()' before verifying that the sub-command is recognized. Push this call down into the individual sub-commands so that we don't enter a bogus command mode. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau committed
Mar 30, 2021 at 11:04 UTC
690eb057198275b314b776688240fcc7f9e789d0
1 file changed
+8
-2
builtin/multi-pack-index.c
+8
-2
@@ -63,6 +63,8 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)
63
{
64
struct option *options = common_opts;
65
66
+ trace2_cmd_mode(argv[0]);
67
+
68
argc = parse_options(argc, argv, NULL,
69
options, builtin_multi_pack_index_write_usage,
70
PARSE_OPT_KEEP_UNKNOWN);
@@ -77,6 +79,8 @@ static int cmd_multi_pack_index_verify(int argc, const char **argv)
79
{
80
struct option *options = common_opts;
81
82
+ trace2_cmd_mode(argv[0]);
83
+
84
argc = parse_options(argc, argv, NULL,
85
options, builtin_multi_pack_index_verify_usage,
86
PARSE_OPT_KEEP_UNKNOWN);
@@ -91,6 +95,8 @@ static int cmd_multi_pack_index_expire(int argc, const char **argv)
95
{
96
struct option *options = common_opts;
97
98
+ trace2_cmd_mode(argv[0]);
99
+
100
argc = parse_options(argc, argv, NULL,
101
options, builtin_multi_pack_index_expire_usage,
102
PARSE_OPT_KEEP_UNKNOWN);
@@ -112,6 +118,8 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv)
118
119
options = add_common_options(builtin_multi_pack_index_repack_options);
120
121
+ trace2_cmd_mode(argv[0]);
122
+
123
argc = parse_options(argc, argv, NULL,
124
options,
125
builtin_multi_pack_index_repack_usage,
@@ -147,8 +155,6 @@ int cmd_multi_pack_index(int argc, const char **argv,
155
usage_with_options(builtin_multi_pack_index_usage,
156
builtin_multi_pack_index_options);
157
150
- trace2_cmd_mode(argv[0]);
151
-
158
if (!strcmp(argv[0], "repack"))
159
return cmd_multi_pack_index_repack(argc, argv);
160
else if (!strcmp(argv[0], "write"))