'git branch --no-merge' is ambiguous
Look here:
$ git branch --merge
* master
$ git branch --no-merge
error: Ambiguous option: no-merge (could be --no-merged or --no-merged)
usage: ...
--no-merged <commit> print only not merged branches
--merged <commit> print only merged branchesI tried to debug it, but parse_long_opt() is such awful spaghetti code that I don't grok it. Please help.
-- Hannes
Quoted 10 lines · Johannes Sixt
Look here:
$ git branch --merge * master $ git branch --no-merge error: Ambiguous option: no-merge (could be --no-merged or --no-merged) usage: ... --no-merged <commit> print only not merged branches --merged <commit> print only merged branches
Quoted 2 lines
I tried to debug it, but
parse_long_opt()is such awful spaghetti code that I don't grok it. Please help.
parse_long_opt always matches both --opt and --no-opt for any option "opt", and only get_value checks whether --no-opt is actually valid. Since the options for git branch contains both "no-merged" and "merged" there are two matches for --no-merge, but no exact match. With this patch the negation of a NONEG option is rejected earlier, but it changes the error message from "option no-opt' isn't available" to "unknown option no-opt'".
parse-options.c +3 -0
@@ -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 ;
Andreas.
Signature · 3 lines
Andreas Schwab, [email protected] GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
Quoted 7 lines · Andreas Schwab
parse_long_optalways matches both --opt and --no-opt for any option "opt", and onlyget_valuechecks whether --no-opt is actually valid. Since the options for git branch contains both "no-merged" and "merged" there are two matches for --no-merge, but no exact match. With this patch the negation of a NONEG option is rejected earlier, but it changes the error message from "optionno-opt' isn't available" to "unknown optionno-opt'".
Thanks. Reading through the code, I came to the same conclusion: we shouldn't be looking at --no-* at all if we are NONEG. I think the change in error message is acceptable.
It is a little bit annoying that builtin-branch needs to have this as two separate options in the first place. But it wants to be able to do --no-merged with an argument, which is not currently possible with just a negation of --merged. I don't know if it is worth adding an OPT_NEGARG.
Below is what I'm going to commit. Can I get your Signed-off-by?
-- >8 --
From: Andreas Schwab <[email protected]>
Subject: [PATCH] parse-opt: ignore negation of OPT_NONEG for ambiguity checks
parse_long_opt always matches both --opt and --no-opt for any option "opt", and only get_value checks whether --no-opt is actually valid. Since the options for git branch contains both "no-merged" and "merged" there are two matches for --no-merge, but no exact match. With this patch the negation of a NONEG option is rejected earlier, but it changes the error message from "option no-opt' isn't available" to "unknown option no-opt'".
[jk: added test]
--- parse-options.c | 3 +++ t/t0040-parse-options.sh | 20 ++++++++++++++++++++ test-parse-options.c | 5 +++++ 3 files changed, 28 insertions(+), 0 deletions(-)
parse-options.c +3 -0
@@ -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 ;
t/t0040-parse-options.sh +20 -0
@@ -33,6 +33,8 @@ Magic arguments --quux means --quux -NUM set integer to NUM + same as -b + --ambiguous positive ambiguity + --no-ambiguous negative ambiguity Standard options --abbrev[=<n>] use <n> digits to display SHA-1s
@@ -315,4 +317,22 @@ test_expect_success 'OPT_NUMBER_CALLBACK() works' ' test_cmp expect output ' +cat >expect <<EOF +boolean: 0 +integer: 0 +timestamp: 0 +string: (not set) +abbrev: 7 +verbose: 0 +quiet: no +dry run: no +file: (not set) +EOF + +test_expect_success 'negation of OPT_NONEG flags is not ambiguous' ' + test-parse-options --no-ambig >output 2>output.err && + test ! -s output.err && + test_cmp expect output +' + test_done
test-parse-options.c +5 -0
@@ -8,6 +8,7 @@ static int abbrev = 7;static int verbose =0 , dry_run =0 , quiet =0 ;static char *string =NULL ;static char *file =NULL ; +static int ambiguous;static int length_callback (const struct option *opt,const char *arg,int unset) {
@@ -59,6 +60,10 @@ int main(int argc, const char **argv) number_callback), {OPTION_BOOLEAN ,'+' ,NULL , &boolean,NULL ,"same as -b" , PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH }, + { OPTION_BOOLEAN, 0, "ambiguous", &ambiguous, NULL, + "positive ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG }, + { OPTION_BOOLEAN, 0, "no-ambiguous", &ambiguous, NULL, + "negative ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG },OPT_GROUP ("Standard options" ),OPT__ABBREV (&abbrev), OPT__VERBOSE(&verbose),
Signature · 1 line
1.6.5.rc2.197.g25cf3
Quoted 12 lines · Jeff King
-- >8 --
From: Andreas Schwab <[email protected]>
Subject: [PATCH] parse-opt: ignore negation ofOPT_NONEGfor ambiguity checks
parse_long_optalways matches both --opt and --no-opt for any option "opt", and onlyget_valuechecks whether --no-opt is actually valid. Since the options for git branch contains both "no-merged" and "merged" there are two matches for --no-merge, but no exact match. With this patch the negation of a NONEG option is rejected earlier, but it changes the error message from "optionno-opt' isn't available" to "unknown optionno-opt'".
Quoted 3 lines
[jk: added test]
Signed-off-by Jeff King <[email protected]>
Andreas.
Signature · 3 lines
Andreas Schwab, [email protected] GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."