mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

parse-options: simplify positivation handling

Browse Source 
We accept the positive version of options whose long name starts with
"no-" and are defined without the flag PARSE_OPT_NONEG.  E.g. git clone
has an explicitly defined --no-checkout option and also implicitly
accepts --checkout to override it.

parse_long_opt() handles that by restarting the option matching with the
positive version when it finds that only the current option definition
starts with "no-", but not the user-supplied argument.  This code is
located almost at the end of the matching logic.

Avoid the need for a restart by moving the code up.  We don't have to
check the positive arg against the negative long_name at all -- the
"no-" prefix of the latter makes a match impossible.  Skip it and toggle
OPT_UNSET right away to simplify the control flow.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2024-01-21 18:56:39 +01:00 committed by Junio C Hamano
parent 5825268db1
commit 457f96252f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
parse-options.c
View File

@ -369,7 +369,11 @@ static enum parse_opt_result parse_long_opt(
if (!long_name)
continue;
again:
if (!starts_with(arg, "no-") &&
!(options->flags & PARSE_OPT_NONEG) &&
skip_prefix(long_name, "no-", &long_name))
opt_flags |= OPT_UNSET;
if (!skip_prefix(arg, long_name, &rest))
rest = NULL;
if (!rest) {
@ -403,13 +407,8 @@ is_abbreviated:
goto is_abbreviated;
}
/* negated? */
if (!starts_with(arg, "no-")) {
if (skip_prefix(long_name, "no-", &long_name)) {
opt_flags |= OPT_UNSET;
goto again;
}
if (!starts_with(arg, "no-"))
continue;
}
flags |= OPT_UNSET;
if (!skip_prefix(arg + 3, long_name, &rest)) {
/* abbreviated and negated? */