-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
Clean up .gitignore #84374
Clean up .gitignore #84374
Conversation
(rust-highfive has picked a reviewer for you, use r? to override) |
.gitignore
Outdated
/dist/ | ||
/obj/ | ||
/unicode-downloads/ | ||
/target/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a trailing slash for consistency, or does that change anything?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If there is a separator at the end of the pattern then the pattern will only match directories, otherwise the pattern can match both files and directories.
I think only matching directories is correct.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dropping a trailing slash is needed to support symlinks, and that's what cargo generates by default.
I recommend reverting the addition of a trailing slash.
See also rust-lang/cargo#4944, #70409
When target is a symlink (e.g., to keep build outputs on a separate
partition), Git will not match the /target/ ignore to the symlink
since it is not a directory. Drop the trailing slash to support ignoring
target as a symlink.
r=me if this doesn't change anything other than the windows file, which I think is the case but there's some reshuffling which makes comparison hard. |
The windows file is added, and the Mercurial entries are removed. Other than that all entries are unchanged, only reordered. |
@bors r+ rollup I'll admit I'm not sure this cleanup is really worth the possible risk of getting it wrong, but it doesn't seem too bad. |
📌 Commit c0d05d2 has been approved by |
Clean up .gitignore Categorizes entries in the `.gitignore` file. Other changes: - added `desktop.ini` (Windows equivalent of `.DS_Store`) - removed `.hg/` and `.hgignore`
Clean up .gitignore Categorizes entries in the `.gitignore` file. Other changes: - added `desktop.ini` (Windows equivalent of `.DS_Store`) - removed `.hg/` and `.hgignore`
Clean up .gitignore Categorizes entries in the `.gitignore` file. Other changes: - added `desktop.ini` (Windows equivalent of `.DS_Store`) - removed `.hg/` and `.hgignore`
Rollup of 11 pull requests Successful merges: - rust-lang#80805 (Improve `Iterator::by_ref` example) - rust-lang#84248 (Remove duplicated fn(Box<[T]>) -> Vec<T>) - rust-lang#84321 (rustdoc: Convert sub-variant toggle to HTML) - rust-lang#84359 (:arrow_up: rust-analyzer) - rust-lang#84374 (Clean up .gitignore) - rust-lang#84387 (Move `sys_common::poison` to `sync::poison`) - rust-lang#84430 (doc/platform-support: clarify UEFI support) - rust-lang#84433 (Prevent control, shift and alt keys to make search input lose focus) - rust-lang#84444 (doc: Get rid of "[+] show undocumented items" toggle on numeric From impls) - rust-lang#84456 (Fix ICE if original_span(fn_sig) returns a span not in body sourcefile) - rust-lang#84469 (Update comment on `PrimTy::name_str`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Categorizes entries in the
.gitignore
file.Other changes:
desktop.ini
(Windows equivalent of.DS_Store
).hg/
and.hgignore