Merge branch 'en/fetch-negotiation-default-fix'

[thirdparty/git.git] / parse-options.c

diff --git a/parse-options.c b/parse-options.c
index 629e79634973a6474054b888cff8be4383086a2a..2437ad3bcdd5b6ff06bf3f46fb00a1106958cca3 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -1076,6 +1076,19 @@ void NORETURN usage_msg_opt(const char *msg,
                   const char * const *usagestr,
                   const struct option *options)
 {
-       fprintf(stderr, "fatal: %s\n\n", msg);
+       die_message("%s\n", msg); /* The extra \n is intentional */
        usage_with_options(usagestr, options);
 }
+
+void NORETURN usage_msg_optf(const char * const fmt,
+                            const char * const *usagestr,
+                            const struct option *options, ...)
+{
+       struct strbuf msg = STRBUF_INIT;
+       va_list ap;
+       va_start(ap, options);
+       strbuf_vaddf(&msg, fmt, ap);
+       va_end(ap);
+
+       usage_msg_opt(msg.buf, usagestr, options);
+}