[rollup] Preserve apply-patch existing-file newline style (fork #1 / upstream codex#4003)#3
Open
ctkm-aelf wants to merge 1 commit into
Open
[rollup] Preserve apply-patch existing-file newline style (fork #1 / upstream codex#4003)#3ctkm-aelf wants to merge 1 commit into
ctkm-aelf wants to merge 1 commit into
Conversation
Closes #1. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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
1 participant
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.
Rollup: integration → main — Stage-1 autonomous consensus-loop result
Promotes the verified fix from
integrationtomainfor human review (this is the Stage-1 gate;ROLLUP_AUTO_MERGE=manual).Source issue: fork #1 — mirrored from openai#4003 ("Patched files have mixed line endings on Windows").
Fix: preserve each file's existing newline style in apply-patch updates — detect LF vs CRLF from original contents, serialize with the original separator, LF fallback for LF-only/empty/mixed. Touches
codex-rs/apply-patch/src/lib.rs+ two byte-exact CRLF/LF scenario fixtures.Pipeline that produced this:
consensus: hybrid-A+Bjust fmt✓,clippy -p codex-apply-patch✓,nextest84/84 ✓ (incl. the new CRLF/LF fixtures)integration(b67d66692)Next (optional): the same verified fix is a strong candidate for Track-B upstream promotion to openai#4003 (root-cause analysis comment + diff, per their contribution funnel).
⟦AI:AUTO-LOOP⟧