-
Notifications
You must be signed in to change notification settings - Fork 12.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve support of using jj
to manage rust-lang/rust
as a collocated git repo
#128708
Comments
jj
to manage rust-lang/rust
as a collocated git repojj
to manage rust-lang/rust
as a collocated git repo
So it turns out that For now I'm going with |
re crlf, as a source control expert I'd recommend never using any kind of autoconversion -- it is a bit of a nightmare to work with in too many cases. Rather, I'd consider checking in the file with CRLFs, and disabling autoconversion so files are always checked out as-is. (Another option is to effectively treat the file as binary content, e.g. use some other means of encoding the file, such as base64 or putting it in a tarball. But I don't know how practical that is) |
Rollup merge of rust-lang#128755 - yaahc:jj-crlf, r=estebank Integrate crlf directly into related test file instead via of .gitattributes resolves rust-lang#128708 This PR seeks to resolve a contributor papercut when using jj to manage the git repo locally which does not support .gitattributes. It does so by integrating the crlf characters directly into the related test and disabling Git's end of line normalization logic across platforms for that specific file, instead of configuring git to always check out the files with alternative eol characters. related documentation: https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-Unset-1
Right now using
jj
to manage the rust-lang/rust repo locally causesx tidy
to fail: #128706This is a result of jj not yet having support for
.gitattributes
which is responsible for adding thecrlf
character to the failing test.While I would love to get that support added to jj upstream I'm assuming it is non-trivial and I'd like a better solution in the short term so I can continue to use
jj
while contributing to the compiler.@jyn514 suggested I use
--exclude tests/rustdoc-ui/intra-doc/warning-crlf.rs
in the meantime which I'm fine with but I'd like a way to set this in myconfig.toml
or some equivalent mechanism doesn't require manually adding this set of arguments to every invocation ofx test
I make.The text was updated successfully, but these errors were encountered: