From ee37d9769800c5482ee0a70b3af41b28a39f4c53 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 13 Feb 2024 06:42:02 +0100 Subject: Merging upstream version 3.6.1. Signed-off-by: Daniel Baumann --- tests/staged_files_only_test.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests/staged_files_only_test.py') diff --git a/tests/staged_files_only_test.py b/tests/staged_files_only_test.py index 58dbe5a..cd2f638 100644 --- a/tests/staged_files_only_test.py +++ b/tests/staged_files_only_test.py @@ -358,6 +358,21 @@ def test_crlf(in_git_dir, patch_dir, crlf_before, crlf_after, autocrlf): assert_no_diff() +@pytest.mark.parametrize('autocrlf', ('true', 'input')) +def test_crlf_diff_only(in_git_dir, patch_dir, autocrlf): + # due to a quirk (?) in git -- a diff only in crlf does not show but + # still results in an exit code of `1` + # we treat this as "no diff" -- though ideally it would discard the diff + # while committing + cmd_output('git', 'config', '--local', 'core.autocrlf', autocrlf) + + _write(b'1\r\n2\r\n3\r\n') + cmd_output('git', 'add', 'foo') + _write(b'1\n2\n3\n') + with staged_files_only(patch_dir): + pass + + def test_whitespace_errors(in_git_dir, patch_dir): cmd_output('git', 'config', '--local', 'apply.whitespace', 'error') test_crlf(in_git_dir, patch_dir, True, True, 'true') -- cgit v1.2.3