diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-05 22:26:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 22:26:13 (GMT) |
| commit | 1c418243a525328b7261ba2c1f2cd93fd52191a2 (patch) | |
| tree | 89da5642eb0aa051a1508c5b3f0a7a3b6d42cf31 /t | |
| parent | f5dd919064c30fb8f22f022455eeaf975eff57c6 (diff) | |
| parent | 9e5da3d055c558fc6492d3b996736ff7e8d115c3 (diff) | |
| download | git-1c418243a525328b7261ba2c1f2cd93fd52191a2.zip git-1c418243a525328b7261ba2c1f2cd93fd52191a2.tar.gz git-1c418243a525328b7261ba2c1f2cd93fd52191a2.tar.bz2 | |
Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
"git add --ignore-errors" did not work as advertised and instead
worked as an unintended synonym for "git add --renormalize", which
has been fixed.
* jk/add-ignore-errors-bit-assignment-fix:
add: use separate ADD_CACHE_RENORMALIZE flag
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0025-crlf-renormalize.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t0025-crlf-renormalize.sh b/t/t0025-crlf-renormalize.sh index 9d9e02a..e13363a 100755 --- a/t/t0025-crlf-renormalize.sh +++ b/t/t0025-crlf-renormalize.sh @@ -27,4 +27,13 @@ test_expect_success 'renormalize CRLF in repo' ' test_cmp expect actual ' +test_expect_success 'ignore-errors not mistaken for renormalize' ' + git reset --hard && + echo "*.txt text=auto" >.gitattributes && + git ls-files --eol >expect && + git add --ignore-errors "*.txt" && + git ls-files --eol >actual && + test_cmp expect actual +' + test_done |