diff options
author | Jeff King <peff@peff.net> | 2016-12-14 10:10:10 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-14 09:58:09 -0800 |
commit | 87433261a46db1a9bd012acd7fba868f009ba38f (patch) | |
tree | 466f8a12f40f7152157487685aa6118e1527b8f9 /parse-options.c | |
parent | 0202c411edc25940cc381bf317badcdf67670be4 (diff) | |
download | git-87433261a46db1a9bd012acd7fba868f009ba38f.tar.gz |
parse-options: print "fatal:" before usage_msg_opt()jk/parseopt-usage-msg-opt
Programs may use usage_msg_opt() to print a brief message
followed by the program usage, and then exit. The message
isn't prefixed at all, though, so it doesn't match our usual
error output and is easy to overlook:
$ git clone 1 2 3
Too many arguments.
usage: git clone [<options>] [--] <repo> [<dir>]
-v, --verbose be more verbose
-q, --quiet be more quiet
--progress force progress reporting
-n, --no-checkout don't create a checkout
--bare create a bare repository
[...and so on for another 31 lines...]
It looks especially bad when the message starts with an
option, like:
$ git replace -e
-e needs exactly one argument
usage: git replace [-f] <object> <replacement>
or: git replace [-f] --edit <object>
[...etc...]
Let's put our usual "fatal:" prefix in front of it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
-rw-r--r-- | parse-options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c index 312a85dbde..4fbe924a5d 100644 --- a/parse-options.c +++ b/parse-options.c @@ -661,7 +661,7 @@ void NORETURN usage_msg_opt(const char *msg, const char * const *usagestr, const struct option *options) { - fprintf(stderr, "%s\n\n", msg); + fprintf(stderr, "fatal: %s\n\n", msg); usage_with_options(usagestr, options); } |