diff options
| author | Pierre Habouzit <madcoder@debian.org> | 2008-01-26 12:26:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-26 10:53:31 -0800 |
| commit | 3a9f0f41db87e197708f84aeb2487bc983f99c9c (patch) | |
| tree | ab4786304593bb88c652c0fa1c348b9bf9343792 /t | |
| parent | 923e3ec84a4e792ca277aac08e52ec2f9b47a8eb (diff) | |
| download | git-3a9f0f41db87e197708f84aeb2487bc983f99c9c.tar.gz | |
parse-options: catch likely typo in presense of aggregated options.
If options are aggregated, and that the whole token is an exact
prefix of a long option that is longer than 2 letters, reject
it. This is to prevent a common typo:
$ git commit -amend
to get interpreted as "commit all with message 'end'".
The typo check isn't performed if there is no aggregation,
because the stuck form is the recommended one. If we have `-o`
being a valid short option that takes an argument, and --option
a long one, then we _MUST_ accept -option as "'o' option with
argument 'ption'", which is our official recommended form.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0040-parse-options.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index 462fdf262f..0a3b55d121 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -19,6 +19,7 @@ string options get a string --string2 <str> get another string --st <st> get another string (pervert ordering) + -o <str> get another string EOF @@ -103,4 +104,14 @@ test_expect_success 'non ambiguous option (after two options it abbreviates)' ' git diff expect output ' +cat > expect.err << EOF +error: did you mean \`--boolean\` (with two dashes ?) +EOF + +test_expect_success 'detect possible typos' ' + ! test-parse-options -boolean > output 2> output.err && + test ! -s output && + git diff expect.err output.err +' + test_done |