Preserve CRLF during partial staging - #328187
Open
Vivek JM (vivekjm) wants to merge 2 commits into
Open
Conversation
Contributor
📬 CODENOTIFYThe following users are being notified based on files changed in this PR: Ladislau Szomoru (@lszomoru)Matched files:
|
Contributor
There was a problem hiding this comment.
Pull request overview
Preserves indexed CRLF line endings during partial Git staging.
Changes:
- Detects indexed CRLF files before hashing.
- Temporarily disables
core.autocrlffor those files. - Adds CRLF regression coverage.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
extensions/git/src/git.ts |
Adjusts partial-staging object hashing. |
extensions/git/src/test/smoke.test.ts |
Adds CRLF partial-staging coverage. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #96104
Partial staging hashes the edited contents with
hash-object --path. Whencore.autocrlfis enabled, Git applies that setting during hashing and silently converts an indexed CRLF file to LF, including lines outside the selected range.This checks the indexed line ending with
git ls-files --eoland disablescore.autocrlfonly while hashing files whose index form is CRLF. Other files and configured clean filters keep their existing behavior.Tests run:
npm run gulp compile-extension:git(0 errors)