Handle git deleted files with dirty worktree. #9645
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
|
r? @Eh2406 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors: r+ |
|
📌 Commit 97a1350 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 3, 2021
Update cargo 5 commits in 4952979031e2cf1d901c817a32e25a156a19db4c..3ebb5f15a940810f250b68821149387af583a79e 2021-07-01 01:14:50 +0000 to 2021-07-02 20:35:38 +0000 - Adjust the edition2021 resolver diff report. (rust-lang/cargo#9649) - Include the linker in the fingerprint. (rust-lang/cargo#9647) - Temporarily disable windows env test. (rust-lang/cargo#9646) - Handle git deleted files with dirty worktree. (rust-lang/cargo#9645) - Adjust error message with offline and frozen. (rust-lang/cargo#9644)
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.
When listing git files for things like
cargo package, it was including unstaged deleted files. This is because the file is still in the index, so it was included in the list.cargo package --allow-dirtywould then fail with a confusing "file not found" error.This fixes it by keeping a set of deleted files, and skipping those. This allows
cargo package --allow-dirtyto work.Closes #9580