Skip to content

Mark a test as binary for git#157183

Open
bjorn3 wants to merge 1 commit into
rust-lang:mainfrom
bjorn3:fix_test_gitattributes
Open

Mark a test as binary for git#157183
bjorn3 wants to merge 1 commit into
rust-lang:mainfrom
bjorn3:fix_test_gitattributes

Conversation

@bjorn3
Copy link
Copy Markdown
Member

@bjorn3 bjorn3 commented May 31, 2026

Otherwise git will keep changing the CRLF back to LF.

Regression from #157176

@bjorn3
Mark a test as binary for git
7a8a90b 
Otherwise git will keep changing the CRLF back to LF.
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 31, 2026

This PR modifies tests/ui/issues/. If this PR is adding new tests to tests/ui/issues/,
please refrain from doing so, and instead add it to more descriptive subdirectories.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 31, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 31, 2026

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 73 candidates
  • Random selection from 17 candidates

@bjorn3
Copy link
Copy Markdown
Member Author

bjorn3 commented May 31, 2026

@bors rollup

@bjorn3
Copy link
Copy Markdown
Member Author

bjorn3 commented May 31, 2026

Perhaps tidy should check that all ignore-tidy-cr files are marked as binary in .gitattributes and that non-existent files aren't referenced by .gitattributes.

@Urgau
Copy link
Copy Markdown
Member

Urgau commented May 31, 2026

Perhaps tidy should check that all ignore-tidy-cr files are marked as binary in .gitattributes and that non-existent files aren't referenced by .gitattributes.

I was gonna suggest the same thing.

@JohnTitor JohnTitor mentioned this pull request May 31, 2026
Open
@JohnTitor
Copy link
Copy Markdown
Member

JohnTitor commented May 31, 2026

Perhaps tidy should check that all ignore-tidy-cr files are marked as binary in .gitattributes and that non-existent files aren't referenced by .gitattributes.

Opened #157184 as a follow-up issue.

JohnTitor
JohnTitor approved these changes May 31, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@JohnTitor JohnTitor left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once CI passes

View changes since this review

@aDotInTheVoid
Copy link
Copy Markdown
Member

aDotInTheVoid commented May 31, 2026

@bors r=JohnTitor p=1

(Breaks git switching off latest main, and the queue is empty anyway)

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 31, 2026

📌 Commit 7a8a90b has been approved by JohnTitor

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 31, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 31, 2026 •
edited
Loading

⌛ Testing commit 7a8a90b with merge 9e293ae...

Workflow: https://github.com/rust-lang/rust/actions/runs/26709782266

rust-bors Bot pushed a commit that referenced this pull request May 31, 2026
@bors
Auto merge of #157183 - bjorn3:fix_test_gitattributes, r=JohnTitor
9e293ae 
Mark a test as binary for git

Otherwise git will keep changing the CRLF back to LF.

Regression from #157176
@Noratrieb
Copy link
Copy Markdown
Member

Noratrieb commented May 31, 2026

Another approach for stopping such issues in the future would be to make it a run-make test that generates the source file from a Rust string literal, so the \r character is never in the source code at all.

@jieyouxu
Copy link
Copy Markdown
Member

jieyouxu commented May 31, 2026

@bors p=5 (in case this bounces)

@Noratrieb
Copy link
Copy Markdown
Member

Noratrieb commented May 31, 2026

@bors p=15 go big or go home

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

Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees

@JohnTitor JohnTitor

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@bjorn3 @rustbot @Urgau @JohnTitor @aDotInTheVoid @Noratrieb @jieyouxu