diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-30 13:34:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-30 13:34:12 -0800 |
| commit | 2e77b83993fa158da009dfdf18ec9f8856053895 (patch) | |
| tree | f73ec360ba07f24c8a01d8797089efd3af53015c /t | |
| parent | 262fa1e968e8e11884afd644e788937b70a1e53e (diff) | |
| parent | 457f96252fcfd64127f71e8663e2e4b6dfd4576c (diff) | |
| download | git-2e77b83993fa158da009dfdf18ec9f8856053895.tar.xz | |
Merge branch 'rs/parse-options-with-keep-unknown-abbrev-fix'
"git diff --no-rename A B" did not disable rename detection but did
not trigger an error from the command line parser.
* rs/parse-options-with-keep-unknown-abbrev-fix:
parse-options: simplify positivation handling
parse-options: fully disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4013-diff-various.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index cb094241ec..1e3b2dbea4 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -663,4 +663,10 @@ test_expect_success 'diff --default-prefix overrides diff.mnemonicprefix' ' check_prefix actual a/file0 b/file0 ' +test_expect_success 'diff --no-renames cannot be abbreviated' ' + test_expect_code 129 git diff --no-rename >actual 2>error && + test_must_be_empty actual && + grep "invalid option: --no-rename" error +' + test_done |