Skip to content

Conversation

alexcrichton
Copy link
Member

They're not being tracked, so no worries if we stomp over them!

@rust-highfive
Copy link

r? @matklad

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
Copy link
Contributor

bors commented Jul 22, 2018

☔ The latest upstream changes (presumably #5762) made this pull request unmergeable. Please resolve the merge conflicts.

@birkenfeld
Copy link
Contributor

Hmm, does this now also ignore untracked .rs source files? That would probably be against the spirit of the warning...

@dwijnand
Copy link
Contributor

Fixes #5771

@killercup
Copy link
Contributor

killercup commented Jul 23, 2018

I agree with @birkenfeld. IIRC, our idea was to warn people when cargo-fix would change files that were not under version control. So, I can see the reason why we should not concern ourselves with files that are explicitly ignored (in .gitignore), but untracked files (e.g. newly created ones), we should still warn about. (Assuming I understand the git lingo correctly, I'm looking at git2 docs and the git book.)

They're not being tracked, so no worries if we stomp over them!
@alexcrichton alexcrichton force-pushed the fix-no-warn-ignored branch from 8fe3534 to 6cdee67 Compare July 23, 2018 14:34
@alexcrichton
Copy link
Member Author

r? @killercup

@bors: delegate=killercup

Updated to include untracked files!

@bors
Copy link
Contributor

bors commented Jul 23, 2018

✌️ @killercup can now approve this pull request

@rust-highfive rust-highfive assigned killercup and unassigned matklad Jul 23, 2018
@killercup
Copy link
Contributor

Thanks, Alex! LGTM

@bors r+

@bors
Copy link
Contributor

bors commented Jul 23, 2018

📌 Commit 6cdee67 has been approved by killercup

@bors
Copy link
Contributor

bors commented Jul 23, 2018

⌛ Testing commit 6cdee67 with merge c744090...

bors added a commit that referenced this pull request Jul 23, 2018
Don't warn about ignored files in cargo-fix

They're not being tracked, so no worries if we stomp over them!
@bors
Copy link
Contributor

bors commented Jul 23, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: killercup
Pushing c744090 to master...

@bors bors merged commit 6cdee67 into rust-lang:master Jul 23, 2018
@Eh2406
Copy link
Contributor

Eh2406 commented Jul 23, 2018

Is this going to be affected by https://github.com/alexcrichton/git2-rs/issues/334, if not is this an alternative workaround for #5733?

@alexcrichton alexcrichton deleted the fix-no-warn-ignored branch July 23, 2018 21:37
@alexcrichton
Copy link
Member Author

@Eh2406 I believe this is using a different API so it shouldn't need that fix

@durka
Copy link
Contributor

durka commented Jul 25, 2018

Do we know when this will be out in nightly? Latest nightly's cargo is a week old.

@ehuss ehuss added this to the 1.29.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants