-
-
Notifications
You must be signed in to change notification settings - Fork 425
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: no longer include untracked files in backup stash #827
Conversation
This happens because when reverting, we call |
Codecov Report
@@ Coverage Diff @@
## master #827 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 13 13
Lines 513 513
Branches 109 109
=========================================
Hits 513 513
Continue to review full report at Codecov.
|
@okonet Travis integration is broken, but you can see that it passed here: https://travis-ci.org/github/okonet/lint-staged/builds/670434608 I'm unable to merge because the button is disabled. |
Yeah I don’t know why it’s not working anymore |
Since v10.1 having untracked files in the backup stash causes revert to fail, because the stash will not apply with the same files already on disk.
956ae3c
to
76cf26b
Compare
@okonet I rebased this on master, since the release job seems to be working. It didn't generate a release because all commits are of https://github.com/okonet/lint-staged/runs/561725417?check_suite_focus=true#step:5:59 [8:47:40 AM] [semantic-release] › ℹ There are no relevant changes, so no new version is released. |
So we merge this one and expect a release? Right? |
@okonet Yeah, that should be what's happening since these are |
🎉 This PR is included in version 10.1.2 🎉 The release is available on: Your semantic-release bot 📦🚀 |
@okonet great success! |
Since v10.1 having untracked files in the backup stash causes revert to fail, because the stash will not apply with the same files already on disk.
Fixes #826