diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2012-03-03 12:00:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-04 18:28:59 -0800 |
| commit | 38916c5b4740f6db09dc140a84bb470dfb582366 (patch) | |
| tree | 72051a87034959717d84c8f209dd3ee725fcead1 | |
| parent | b22939a2860604bec718cfd751e930f3a8afd1cc (diff) | |
| download | git-38916c5b4740f6db09dc140a84bb470dfb582366.tar.gz | |
parse-options: typo check for unknown switches
The user specifies a long option but forgets to type the second
leading dash, we currently detect and report that fact if its first
letter is a valid short option. This is done for safety, to avoid
ambiguity between short options (and their arguments) and a long
option with a missing dash.
This diagnostic message is also helpful for long options whose first
letter is not a valid short option, however. Print it in that case,
too, as a courtesy.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | parse-options.c | 2 | ||||
| -rwxr-xr-x | t/t0040-parse-options.sh | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/parse-options.c b/parse-options.c index 190899611e..850cfa78c9 100644 --- a/parse-options.c +++ b/parse-options.c @@ -393,6 +393,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, case -1: return parse_options_usage(ctx, usagestr, options, 1); case -2: + if (ctx->opt) + check_typos(arg + 1, options); goto unknown; } if (ctx->opt) diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index a44bcb9b39..e3f354a45e 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -236,6 +236,16 @@ test_expect_success 'detect possible typos' ' test_cmp typo.err output.err ' +cat > typo.err << EOF +error: did you mean \`--ambiguous\` (with two dashes ?) +EOF + +test_expect_success 'detect possible typos' ' + test_must_fail test-parse-options -ambiguous > output 2> output.err && + test ! -s output && + test_cmp typo.err output.err +' + cat > expect <<EOF boolean: 0 integer: 0 |