@matheusbsbs / matheus-bagliano / commits / cc74afb83f

multi-pack-index: simplify handling of unknown --options

Although parse_options() can handle unknown --options just fine, none of 'git multi-pack-index's subcommands rely on it, but do it on their own: they invoke parse_options() with the PARSE_OPT_KEEP_UNKNOWN flag, then check whether there are any unparsed arguments left, and print usage and quit if necessary. Drop that PARSE_OPT_KEEP_UNKNOWN flag to let parse_options() handle unknown options instead, which has the additional benefit that it prints not only the usage but an "error: unknown option `foo'" message as well. Do leave the unparsed arguments check to catch any unexpected non-option arguments, though, e.g. 'git multi-pack-index write foo'. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

SZEDER Gábor committed Jul 10, 2022 at 17:16 UTC cc74afb83f7bd57002ce791e66290b20120ff9f3

1 file changed +4 -4

builtin/multi-pack-index.c

+4 -4

@@ -134,7 +134,7 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)

134 opts.flags |= MIDX_PROGRESS;

135 argc = parse_options(argc, argv, NULL,

136 options, builtin_multi_pack_index_write_usage,

137 - PARSE_OPT_KEEP_UNKNOWN);

137 + 0);

138 if (argc)

139 usage_with_options(builtin_multi_pack_index_write_usage,

140 options);

@@ -176,7 +176,7 @@ static int cmd_multi_pack_index_verify(int argc, const char **argv)

176 opts.flags |= MIDX_PROGRESS;

177 argc = parse_options(argc, argv, NULL,

178 options, builtin_multi_pack_index_verify_usage,

179 - PARSE_OPT_KEEP_UNKNOWN);

179 + 0);

180 if (argc)

181 usage_with_options(builtin_multi_pack_index_verify_usage,

182 options);

@@ -202,7 +202,7 @@ static int cmd_multi_pack_index_expire(int argc, const char **argv)

202 opts.flags |= MIDX_PROGRESS;

203 argc = parse_options(argc, argv, NULL,

204 options, builtin_multi_pack_index_expire_usage,

205 - PARSE_OPT_KEEP_UNKNOWN);

205 + 0);

206 if (argc)

207 usage_with_options(builtin_multi_pack_index_expire_usage,

208 options);

@@ -232,7 +232,7 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv)

232 argc = parse_options(argc, argv, NULL,

233 options,

234 builtin_multi_pack_index_repack_usage,

235 - PARSE_OPT_KEEP_UNKNOWN);

235 + 0);

236 if (argc)

237 usage_with_options(builtin_multi_pack_index_repack_usage,

238 options);