diff --git a/CHANGELOG.md b/CHANGELOG.md index ba491cfb..697e3cd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -261,7 +261,7 @@ ### Features - Run hooks in parallel - - individual hooks may opt out of parallel exection with `require_serial: true` + - individual hooks may opt out of parallel execution with `require_serial: true` - #510 issue by @chriskuehl. - #851 PR by @chriskuehl. @@ -440,7 +440,7 @@ ### Fixes - Fix integration with go 1.10 and `pkg` directory - #725 PR by @asottile -- Restore support for `git<1.8.5` (inadvertantly removed in 1.7.0) +- Restore support for `git<1.8.5` (inadvertently removed in 1.7.0) - #723 issue by @JohnLyman. - #724 PR by @asottile. diff --git a/tests/staged_files_only_test.py b/tests/staged_files_only_test.py index 2410bffe..107c1491 100644 --- a/tests/staged_files_only_test.py +++ b/tests/staged_files_only_test.py @@ -328,7 +328,7 @@ def test_whitespace_errors(in_git_dir, patch_dir): test_crlf(in_git_dir, patch_dir, True, True, 'true') -def test_autocrlf_commited_crlf(in_git_dir, patch_dir): +def test_autocrlf_committed_crlf(in_git_dir, patch_dir): """Regression test for #570""" cmd_output('git', 'config', '--local', 'core.autocrlf', 'false') _write(b'1\r\n2\r\n')