Skip to content

Fix mixed EOL post-commit attribution#1665

Open
zhangzimingmmz wants to merge 1 commit into
git-ai-project:mainfrom
zhangzimingmmz:fix/mixed-eol-attribution
Open

Fix mixed EOL post-commit attribution#1665
zhangzimingmmz wants to merge 1 commit into
git-ai-project:mainfrom
zhangzimingmmz:fix/mixed-eol-attribution

Conversation

@zhangzimingmmz

Copy link
Copy Markdown
Contributor

Summary

  • Normalize line terminators during post-commit virtual attribution comparisons
  • Avoid treating CRLF-vs-LF-only differences as unstaged/carryover changes
  • Add mixed-EOL regression coverage for Windows/autocrlf workflows

Tests

  • cargo test carryover_merge_ignores_mixed_eol_when_content_matches_committed
  • cargo test --test integration test_post_commit_preserves_ai_attribution_for_mixed_eol_worktree
  • cargo fmt -- --check
  • cargo clippy --all-targets -- -D warnings
  • cargo test -- --test-threads 12 (Docker rust:1.93.0, non-root)

@CLAassistant

CLAassistant commented Jun 26, 2026

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@zhangzimingmmz zhangzimingmmz force-pushed the fix/mixed-eol-attribution branch from 77f6dd2 to a47ff04 Compare June 27, 2026 00:57
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