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. Let parse_options() handle unknown options instead, which, besides simpler code, has the additional benefit that it prints not only the usage but an "error: unknown option `foo'" message as well. Signed-off-by: SZEDER Gábor <szeder.dev@xxxxxxxxx> --- builtin/multi-pack-index.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index 5edbb7fe86..97a87ad8cb 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -134,10 +134,7 @@ static int cmd_multi_pack_index_write(int argc, const char **argv) opts.flags |= MIDX_PROGRESS; argc = parse_options(argc, argv, NULL, options, builtin_multi_pack_index_write_usage, - PARSE_OPT_KEEP_UNKNOWN); - if (argc) - usage_with_options(builtin_multi_pack_index_write_usage, - options); + 0); FREE_AND_NULL(options); @@ -176,10 +173,7 @@ static int cmd_multi_pack_index_verify(int argc, const char **argv) opts.flags |= MIDX_PROGRESS; argc = parse_options(argc, argv, NULL, options, builtin_multi_pack_index_verify_usage, - PARSE_OPT_KEEP_UNKNOWN); - if (argc) - usage_with_options(builtin_multi_pack_index_verify_usage, - options); + 0); FREE_AND_NULL(options); @@ -202,10 +196,7 @@ static int cmd_multi_pack_index_expire(int argc, const char **argv) opts.flags |= MIDX_PROGRESS; argc = parse_options(argc, argv, NULL, options, builtin_multi_pack_index_expire_usage, - PARSE_OPT_KEEP_UNKNOWN); - if (argc) - usage_with_options(builtin_multi_pack_index_expire_usage, - options); + 0); FREE_AND_NULL(options); @@ -232,10 +223,7 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv) argc = parse_options(argc, argv, NULL, options, builtin_multi_pack_index_repack_usage, - PARSE_OPT_KEEP_UNKNOWN); - if (argc) - usage_with_options(builtin_multi_pack_index_repack_usage, - options); + 0); FREE_AND_NULL(options); -- 2.37.0.340.g5e8d960d32
