author | Stephen Boyd <bebarino@gmail.com> | |
Wed, 1 Dec 2010 23:30:40 +0000 (17:30 -0600) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 7 Dec 2010 22:19:32 +0000 (14:19 -0800) | ||
commit | c1f4ec9ef45232d6dbdea4c417a9d41eb8ad7f4f | |
tree | da050b7810cb8f2a51e5e4830667fc2870f2f95e | tree | snapshot |
parent | 5c400ed2e05070d79b6cd9438ff5607ec0a83589 | commit | diff |
parse-options: do not infer PARSE_OPT_NOARG from option type
Simplify the "takes no value" error path by relying on PARSE_OPT_NOARG
being set correctly. That is:
- if the PARSE_OPT_NOARG flag is set, reject --opt=value
regardless of the option type;
- if the PARSE_OPT_NOARG flag is unset, accept --opt=value
regardless of the option type.
This way, the accepted usage more closely matches the usage advertised
with --help-all.
No functional change intended, since the NOARG flag is only used
with "boolean-only" option types in existing parse_options callers.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Simplify the "takes no value" error path by relying on PARSE_OPT_NOARG
being set correctly. That is:
- if the PARSE_OPT_NOARG flag is set, reject --opt=value
regardless of the option type;
- if the PARSE_OPT_NOARG flag is unset, accept --opt=value
regardless of the option type.
This way, the accepted usage more closely matches the usage advertised
with --help-all.
No functional change intended, since the NOARG flag is only used
with "boolean-only" option types in existing parse_options callers.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
parse-options.c | diff | blob | history |