diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:06 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:06 -0800 |
commit | 5bc5edbae1c5c3756a8927913d32d2b7519e30b0 (patch) | |
tree | cdf93e2aee7e575a71aaf493be3d170dd0c1e819 | |
parent | bcaf277b4ad5b7173a011d93a2ea1827f990f466 (diff) | |
parent | 87433261a46db1a9bd012acd7fba868f009ba38f (diff) | |
download | git-5bc5edbae1c5c3756a8927913d32d2b7519e30b0.tar.gz |
Merge branch 'jk/parseopt-usage-msg-opt' into maint
The function usage_msg_opt() has been updated to say "fatal:"
before the custom message programs give, when they want to die
with a message about wrong command line options followed by the
standard usage string.
* jk/parseopt-usage-msg-opt:
parse-options: print "fatal:" before usage_msg_opt()
-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); } |