diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t0040-parse-options.sh | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t0040-parse-options.sh')
| -rwxr-xr-x | third_party/git/t/t0040-parse-options.sh | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/third_party/git/t/t0040-parse-options.sh b/third_party/git/t/t0040-parse-options.sh index 3483b72db4..cebc77fab0 100755 --- a/third_party/git/t/t0040-parse-options.sh +++ b/third_party/git/t/t0040-parse-options.sh @@ -23,8 +23,6 @@ usage: test-tool parse-options <options> -j <n> get a integer, too -m, --magnitude <n> get a magnitude --set23 set integer to 23 - --mode1 set integer to 1 (cmdmode option) - --mode2 set integer to 2 (cmdmode option) -L, --length <str> get length of <str> -F, --file <file> set file to <file> @@ -244,7 +242,7 @@ test_expect_success 'Alias options do not contribute to abbreviation' ' ' cat >typo.err <<\EOF -error: did you mean `--boolean` (with two dashes)? +error: did you mean `--boolean` (with two dashes ?) EOF test_expect_success 'detect possible typos' ' @@ -254,7 +252,7 @@ test_expect_success 'detect possible typos' ' ' cat >typo.err <<\EOF -error: did you mean `--ambiguous` (with two dashes)? +error: did you mean `--ambiguous` (with two dashes ?) EOF test_expect_success 'detect possible typos' ' @@ -326,22 +324,6 @@ test_expect_success 'OPT_NEGBIT() works' ' test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4 ' -test_expect_success 'OPT_CMDMODE() works' ' - test-tool parse-options --expect="integer: 1" --mode1 -' - -test_expect_success 'OPT_CMDMODE() detects incompatibility' ' - test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err && - test_must_be_empty output && - test_i18ngrep "incompatible with --mode" output.err -' - -test_expect_success 'OPT_CMDMODE() detects incompatibility with something else' ' - test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err && - test_must_be_empty output && - test_i18ngrep "incompatible with something else" output.err -' - test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' ' test-tool parse-options --expect="boolean: 6" + + + + + + ' @@ -417,11 +399,4 @@ test_expect_success 'GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works' ' test-tool parse-options --ye ' -test_expect_success '--end-of-options treats remainder as args' ' - test-tool parse-options \ - --expect="verbose: -1" \ - --expect="arg 00: --verbose" \ - --end-of-options --verbose -' - test_done |