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
Use git stashes in git workflow for better performance #724
Conversation
Codecov Report
@@ Coverage Diff @@
## master #724 +/- ##
=====================================
Coverage 100% 100%
=====================================
Files 13 13
Lines 429 429
Branches 97 97
=====================================
Hits 429 429 Continue to review full report at Codecov.
|
hey what's the latest with excellent PR? |
@iiroj I'm ready to merge if you think it's complete. Just let me know if I should do the release. Also, did you add the |
lint-staged loses the MERGE_HEAD while stashing backups, so the current behaviour breaks merge conflict resolution. Solution is to manually check, save, and restore the MERGE_HEAD during runtime. This should be fixed and the test adjusted for successful run
@okonet Yeah, I made a logic error in the improved error handling where the backup stash was dropped ("cleaned up") even though there were errors in the previous step. I'll improve it some, but since it's the holidays I'm not sure when. Probably push a commit now and then cleanup in about a week. |
…ed (#762) BREAKING CHANGE: Previously, lint-staged would allow empty commits in the situation where a linter task like "prettier --write" reverts all staged changes automatically. Now the default behaviour is to throw an error with a helpful warning message. The --allow empty option can be used to allow empty commits, or `allowEmpty: true` for the Node.js API.
# Conflicts: # package.json
What do you think, @okonet? There haven't been any new bug reports... |
I'd merge asap! We can iterate on a bigger user base. That should be a community effort and it should not stop us from shipping. |
I'm in a good position right now in the sense that I have time to react to possible bugs after merging, so let's do it! |
# Conflicts: # README.md
@okonet I'm not sure what squashing will do to the multiple breaking change comments, though. Should this just be merged without squashing? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚀
@iiroj yes, we should do a normal merge in this case since all commits are following the convention and the version will be calculated correctly. |
Feel free to merge (do not squash, please) when the build has passed. |
🎉 This PR is included in version 10.0.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
I might be missing something, but I think 5208399 and 083b8e7 interact in an odd way. I have a repo that includes a GraphQL schema. I want this schema to get regenerated on every commit to match the code. Previously, I had a command like Now, however, this gives me the warning added above. I could switch to using a function here to add only the one file, but that would force me to opt out of using |
@taion do you mean your lint-staged task automatically edits other files, and now they don’t get added? This might be so, because we only pass the original list of staged files to Can you open a new issue so we can discuss there? |
I think we still can allow |
Yup, I described it in more detail in #770. |
Revival of #663 in the
beta
branch.lint-staged
doesn't restore unstaged changed when it fails #550git commit
fails, ultimately causing lost work #565