Fix .gitignore of Cargo.lock in a subdirectory. #7779
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors: r+ |
|
📌 Commit 3cedb8e has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 3cedb8e with merge 7fbeb2e5f2efa5bbbc2b223732af51e7731816e4... |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
|
@bors retry |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jan 8, 2020
Fix .gitignore of Cargo.lock in a subdirectory. The code for checking if `Cargo.lock` is ignored was erroneously assuming it was at the root of the git repo. This would cause a problem if `Cargo.lock` is in `.gitignore` in a subdirectory. Fixes issue noted in #7705 (comment)
|
☀️ Test successful - checks-azure |
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Jan 14, 2020
Update cargo rls ## cargo 12 commits in 6e1ca924a67dd1ac89c33f294ef26b5c43b89168..ad3dbe10e1e654fb1f032a5dd9481d7cbaa00d65 2020-01-06 19:11:37 +0000 to 2020-01-13 21:37:15 +0000 - Add named config profiles. (rust-lang/cargo#7750) - Make cargo-rustc crate-type-aware (rust-lang/cargo#7755) - Rename `Kind` (rust-lang/cargo#7791) - Update bash completion (rust-lang/cargo#7789) - Add another curl spurious network error (rust-lang/cargo#7788) - Some small tweaks around error in configuration (rust-lang/cargo#7783) - Fix tests with `url` crate update (rust-lang/cargo#7787) - Fix .gitignore of Cargo.lock in a subdirectory. (rust-lang/cargo#7779) - Bump crates-io (rust-lang/cargo#7778) - Migrate from the `failure` crate to `anyhow` (rust-lang/cargo#7776) - Fix several needless_borrow clippy lints. (rust-lang/cargo#7771) - Fix some links (rust-lang/cargo#7770) ## rls 2 commits in 7c0489c5ff4f5c594e65a3b22efd9ce373deab9b..b27e1173969639448cd2e486b1c5f0fcb1b3b17c 2020-01-04 20:15:37 +0100 to 2020-01-13 11:40:20 +0100 - Update Cargo (rust-lang/rls#1613) - Rustup to #68024 (rust-lang/rls#1612)
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Jan 15, 2020
Update cargo rls ## cargo 12 commits in 6e1ca924a67dd1ac89c33f294ef26b5c43b89168..ad3dbe10e1e654fb1f032a5dd9481d7cbaa00d65 2020-01-06 19:11:37 +0000 to 2020-01-13 21:37:15 +0000 - Add named config profiles. (rust-lang/cargo#7750) - Make cargo-rustc crate-type-aware (rust-lang/cargo#7755) - Rename `Kind` (rust-lang/cargo#7791) - Update bash completion (rust-lang/cargo#7789) - Add another curl spurious network error (rust-lang/cargo#7788) - Some small tweaks around error in configuration (rust-lang/cargo#7783) - Fix tests with `url` crate update (rust-lang/cargo#7787) - Fix .gitignore of Cargo.lock in a subdirectory. (rust-lang/cargo#7779) - Bump crates-io (rust-lang/cargo#7778) - Migrate from the `failure` crate to `anyhow` (rust-lang/cargo#7776) - Fix several needless_borrow clippy lints. (rust-lang/cargo#7771) - Fix some links (rust-lang/cargo#7770) ## rls 2 commits in 7c0489c5ff4f5c594e65a3b22efd9ce373deab9b..b27e1173969639448cd2e486b1c5f0fcb1b3b17c 2020-01-04 20:15:37 +0100 to 2020-01-13 11:40:20 +0100 - Update Cargo (rust-lang/rls#1613) - Rustup to #68024 (rust-lang/rls#1612)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The code for checking if
Cargo.lockis ignored was erroneously assuming it was at the root of the git repo. This would cause a problem ifCargo.lockis in.gitignorein a subdirectory.Fixes issue noted in #7705 (comment)