Skip to content

Checkout failure filtered crlf (first attempt)#7159

Draft
lrm29 wants to merge 3 commits intolibgit2:mainfrom
mathworks:checkout_failure_filtered_crlf
Draft

Checkout failure filtered crlf (first attempt)#7159
lrm29 wants to merge 3 commits intolibgit2:mainfrom
mathworks:checkout_failure_filtered_crlf

Conversation

@lrm29
Copy link
Contributor

@lrm29 lrm29 commented Nov 25, 2025 •
edited
Loading

First attempt at fixing #7158. However a test sporadically fails:

❯ ./libgit2_tests -scheckout
Loaded 385 suites: 
Started (test status codes: OK='.' FAILURE='F' SKIPPED='S')
.........................F...................SSSSSSSSSSSSS........SS.......................................................................................................

  1) Failure:
checkout::crlf::with_ident [/local-ssd/lmcglash/Bteams/mw_libgit2/tests/libgit2/checkout/crlf.c:360]
  crlf/lf.ident
  file content mismatch at byte 2

The idea was that for case 14 in https://github.com/libgit2/libgit2/blob/main/docs/checkout-internals.md (14 | B1 | B1 | B1 | locally modified file (DIRTY)) we would still allow checkout if B1 in workdir is the same due to filtering.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@lrm29