aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-21 14:55:03 -0800
committerJunio C Hamano <gitster@pobox.com>2016-12-21 14:55:03 -0800
commit47021efd6feb5939b89e54c8352204d3ace5f673 (patch)
treeb4c75211b9e55265be79ebe06bc3134523473a2c
parentfe050334074c5132d01e1df2c1b9a82c9b8d394c (diff)
parent87433261a46db1a9bd012acd7fba868f009ba38f (diff)
downloadgit-47021efd6feb5939b89e54c8352204d3ace5f673.tar.gz
git-47021efd6feb5939b89e54c8352204d3ace5f673.tar.xz
Merge branch 'jk/parseopt-usage-msg-opt'
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c
index 312a85dbd..4fbe924a5 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);
}