fix: handle non utf8 files with autocrlf correctly

[jayree]

fix #1908

[jcubic]

Can you add a unit test for this?

[jayree]

@jcubic I tried, but I don't know how to create a new fixture with a binary file included.

[jcubic]

You can try to include files that contain \r and different files that changed. When adding all of them, only files that changed should be in the staging area by statusMatrix. It can be a test for StatusMatrix.

[jayree]

@jcubic the problem is not the test case, I'm unable to create a new working fixture repository. If I include the index the workdir is empty. If I remove the index all files have the status *added

[jcubic]

I will check later today on how to create fixures.

[jayree]

@jcubic I think I've found a way!

[jcubic]

Are those hooks even used? It looks like sample code created by git init. Can you remove them?

[jcubic]

The tests are failing, it throws a wrong error.

Expected 'UnmergedPathsError' to be 'MergeConflictError'.
    at <Jasmine>
    at UserContext.<anonymous> (__tests__/index.webpack.js:2430:24)

[jayree]

@jcubic looks like a framework/devops issue. 2nd run was ok

[jayree]

@jcubic Is anything else missing?

[jcubic]

I would add yet another test, to make sure that normal text files with \r that don't change also are not marked as modified. You can copy and paste the test and use a normal text file instead of a binary file.

[jayree]

@jcubic done

[isomorphic-git-bot]

🎉 This PR is included in version 1.25.9 🎉

The release is available on:

• npm package (@latest dist-tag)
• GitHub release

Your semantic-release bot 📦🚀