Skip to content
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

Fix target entry in .gitignore #13817

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Conversation

rukai
Copy link
Contributor

@rukai rukai commented Apr 28, 2024

The directories at:

Are getting picked up by the target entry in .gitignore, causing git to ignore any extra files added to those directories.
A minor issue I know, but I still think its worth fixing.

Alternative

An alternative solution would be to rename those directories which I'm more than happy to do.
But I think we are better off just changing .gitignore as that is more future proof.

@rustbot
Copy link
Collaborator

rustbot commented Apr 28, 2024

r? @ehuss

rustbot has assigned @ehuss.
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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 28, 2024
.gitignore Outdated
@@ -1,4 +1,4 @@
target
/target
Cargo.lock
Copy link
Member

Choose a reason for hiding this comment

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

Could you also add a / prefix to Cargo.lock? I believe it has the same issue. Thank you :)

$ fd -HI Cargo.lock
Cargo.lock
tests/testsuite/cargo_add/locked_unchanged/in/Cargo.lock
tests/testsuite/cargo_add/lockfile_updated/in/Cargo.lock
tests/testsuite/cargo_add/lockfile_updated/out/Cargo.lock
tests/testsuite/cargo_remove/gc_patch/out/Cargo.lock
tests/testsuite/cargo_remove/update_lock_file/in/Cargo.lock
tests/testsuite/cargo_remove/update_lock_file/out/Cargo.lock

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done!
I also added it to the src/* entries since they all seem to be referring to the root as well.

Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Feel like some ignore entries are no longer necessary, but anyway we can look at them later.

Thanks!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 29, 2024

📌 Commit 433635b has been approved by weihanglo

It is now in the queue for this repository.

@bors bors 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 Apr 29, 2024
@bors
Copy link
Collaborator

bors commented Apr 29, 2024

⌛ Testing commit 433635b with merge 080869e...

@bors
Copy link
Collaborator

bors commented Apr 29, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 080869e to master...

@bors bors merged commit 080869e into rust-lang:master Apr 29, 2024
20 of 21 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 1, 2024
Update cargo

15 commits in b60a1555155111e962018007a6d0ef85207db463..6087566b3fa73bfda29702632493e938b12d19e5
2024-04-26 16:37:29 +0000 to 2024-04-30 20:45:20 +0000
- fix(cargo-fix): dont fix into standard library (rust-lang/cargo#13792)
- refactor: Move diagnostic printing to Shell (rust-lang/cargo#13813)
- Populate git information when building Cargo from Rust's source tarball (rust-lang/cargo#13832)
- docs: fix several typos found by `typos-cli` (rust-lang/cargo#13831)
- fix(alias): Aliases without subcommands should not panic (rust-lang/cargo#13819)
- fix(toml): Improve granularity of traces (rust-lang/cargo#13830)
- fix(toml): Warn, rather than fail publish, if a target is excluded (rust-lang/cargo#13713)
- test(cargo-lints): Add a test to ensure cap-lints works (rust-lang/cargo#13829)
- fix(toml)!: Remove support for inheriting badges (rust-lang/cargo#13788)
- chore(ci): Don't check `cargo` against beta channel (rust-lang/cargo#13827)
- Fix target entry in .gitignore (rust-lang/cargo#13817)
- Bump to 0.81.0; update changelog (rust-lang/cargo#13823)
- Add failing test: artifact_dep_target_specified (rust-lang/cargo#13816)
- fix(cargo-lints): Don't always inherit workspace lints (rust-lang/cargo#13812)
- Update SleepTraker returns_in_order unit test (rust-lang/cargo#13811)

r? ghost
@rustbot rustbot added this to the 1.80.0 milestone May 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants