fix: extra empty lines in diff (Windows) #2015
Merged
+2
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When using CR/LF as newline on Windows, there were extra empty lines shown in diffs. Commit b84b79 fixed a regression (sourcegit-scm#1996) by keeping CRs as content of diff lines instead of removing them. Additionally since commit 796f88 (sourcegit-scm#1543) the output for diffs uses the default newline depending on platform, that's CR/LF on Windows. As consequence on Windows with files containing CR/LF as newlines the content (ending in CR) and the default newline CR/LF resulted in CR CR LF, which is interpreted as two line breaks instead of one. So b84b79 introduced itself a regression that's fixed in this commit by partially reverting commit 796f88. This fixes sourcegit-scm#2001.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using CR/LF as newline on Windows, there were extra empty lines shown in diffs.
Commit b84b79 fixed a regression (#1996) by keeping CRs as content of diff lines instead of removing them. Additionally since commit 796f88 (#1543) the output for diffs uses the default newline depending on platform, that's CR/LF on Windows.
As consequence on Windows with files containing CR/LF as newlines the content (ending in CR) and the default newline CR/LF resulted in CR CR LF, which is interpreted as two line breaks instead of one.
So b84b79 introduced itself a regression that's fixed in this commit by partially reverting commit 796f88.
This fixes #2001.