X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=parse-options.c;h=f5594114ede8a50090c8b97987b52a660235fa56;hb=907a0b1e04ea31cb368e9422df93d8ebb0187914;hp=3b71fbb5410332a3f11ca0e450a614b3345a687b;hpb=86b5efb2864ca50d86437f94ec4c26042cba193e;p=git.git

diff --git a/parse-options.c b/parse-options.c
index 3b71fbb54..f5594114e 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -230,6 +230,9 @@ is_abbreviated:
 				abbrev_flags = flags;
 				continue;
 			}
+			/* negation allowed? */
+			if (options->flags & PARSE_OPT_NONEG)
+				continue;
 			/* negated and abbreviated very much? */
 			if (!prefixcmp("no-", arg)) {
 				flags |= OPT_UNSET;
@@ -549,6 +552,14 @@ void usage_with_options(const char * const *usagestr,
 	exit(129);
 }
 
+void usage_msg_opt(const char *msg,
+		   const char * const *usagestr,
+		   const struct option *options)
+{
+	fprintf(stderr, "%s\n\n", msg);
+	usage_with_options(usagestr, options);
+}
+
 int parse_options_usage(const char * const *usagestr,
 			const struct option *opts)
 {