Merge branch 'maint-1.6.5' into maint

diff --git a/parse-options.c b/parse-options.c
index a64a4d6ee267cf2a691f546f668f3f644616408c..f5594114ede8a50090c8b97987b52a660235fa56 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -230,6 +230,9 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,
                                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;