Skip to content

fix(nexent): keep integration patches free of end-of-line conversion - #2

Merged
heikiscott merged 1 commit into
mainfrom
claude/nexent-restore-fork-verify-6dvndd
Sep 11, 2026
Merged

heikiscott merged 1 commit into
mainfrom
claude/nexent-restore-fork-verify-6dvndd

Conversation

@heikiscott

Copy link
Copy Markdown
Contributor

Summary

Mark integrations/nexent/**/patches/*.patch as -text in .gitattributes so no checkout can apply end-of-line conversion to the Nexent integration patches, and document the symptom in the integration index. Patch bytes are unchanged.

A user applying the patch saw xxx.patch:297: trailing whitespace.. The patch in the repository has no trailing whitespace on any added line; converting the file to CRLF and running git apply reproduces exactly :296: and :297: trailing whitespace. followed by a hard failure inside the embedded binary tarball section, and the SHA-256 no longer matches the manifest.

Task reference

  • This PR links an applicable item in docs/event/tasks.md or explains why none exists.
  • Task: R77

Checks

  • I ran the relevant targeted checks.
  • I ran npm run verify, or documented why it was blocked. (Documentation and attribute change only; ran verify:integration-artifacts, verify:public-identity, verify:docs, and git diff --check. CI runs the full gate on this PR.)
  • I updated the task result and verification evidence when the task is complete.
  • I preserved third-party notices, provenance, and the retained upstream snapshot.

Notes for reviewers

  • git check-attr now reports text: unset and whitespace: unset for both version directories' patch files.
  • The original-byte patch applies with zero warnings under both git am --3way and git apply and yields the expected result tree.
  • Anyone who already has a CRLF-converted copy needs to re-check out the patch after pulling; the acceptance script verifies the SHA-256 first and would have rejected the converted file.

🤖 Generated with Claude Code

https://claude.ai/code/session_01PCEh5gW8GnhGbbykcB15JT


Generated by Claude Code

Mark integrations/nexent/**/patches/*.patch as -text so a CRLF checkout can
no longer break the patch SHA-256 or make git apply report trailing
whitespace and fail on the embedded binary tarballs. Document the symptom
and remedy in the integration index.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PCEh5gW8GnhGbbykcB15JT
@heikiscott
heikiscott merged commit 465c87f into main Sep 11, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants