Incorrect Handling of Partial Stage/Discard with autocrlf Set to False

[Piolie]

Steps to Reproduce

1. Initialize a new Git repository and set the core.autocrlf configuration to false:

git init
git config core.autocrlf false

2. Create a new text document with the following contents, ensuring it uses Windows-style line endings (CRLF):

test1



test3

3. Stage and commit the initial version of the file:

git add *
git commit -m 'first commit'

4. Modify the text file to the following, replacing the line between test1 and test3:

test1

test2

test3

Open sourcegit. Ensure the right panel displays changes (with Ignore Whitespace Changes disabled):

6. Stage the hunk (Ctrl+S) and observe that something is staged, but an un-stageable hunk remains visible in the right panel:

7. Now run the following commands to commit the staged change and reset the un-stageable one:

git commit -m 'second commit'
git reset --hard

8. Check the text file. You should see that the modified line now has a Linux-style EOL character (LF).

Expected Behavior

The line endings remain consistent with the original Windows-style CRLF after setting autocrlf = false, even when making partial stages and discards.

Actual Behavior

The line endings are converted to Linux-style LF when the changes are staged, instead of retaining the original CRLF.

I checked and everything works as expected when the text file contains only LF EOLs.

[sina-hide]

@Piolie Thank you for describing an example for this bug. I've added your example to my script (it's the partially-stages-or-discards-hunk.txt file), that helps demonstrating some bugs regarding staging, discarding and unstaging hunks. You can find it in PR #1996.

[love-linger]

Merged