From 6d68e6a46174746d95373a47ab4ef4f57aa56d22 Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Mon, 20 Aug 2018 16:51:53 +0000 Subject: [PATCH] multi-pack-index: provide more helpful usage info The multi-pack-index builtin has a very simple command-line interface. Instead of simply reporting usage, give the user a hint to why the arguments failed. Reported-by: Eric Sunshine Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano --- builtin/multi-pack-index.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index 6a7aa00cf2..2633efd95d 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -32,16 +32,16 @@ int cmd_multi_pack_index(int argc, const char **argv, opts.object_dir = get_object_directory(); if (argc == 0) - goto usage; + usage_with_options(builtin_multi_pack_index_usage, + builtin_multi_pack_index_options); - if (!strcmp(argv[0], "write")) { - if (argc > 1) - goto usage; + if (argc > 1) { + die(_("too many arguments")); + return 1; + } + if (!strcmp(argv[0], "write")) return write_midx_file(opts.object_dir); - } -usage: - usage_with_options(builtin_multi_pack_index_usage, - builtin_multi_pack_index_options); + die(_("unrecognized verb: %s"), argv[0]); } -- 2.47.1