fix: eslint pre-commit hook now supports partially staged files #16137
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
peter-sanderson
added
the
no-project
peter-sanderson
force-pushed
the
pre-commit-hook-only-partial-files
branch
2 times, most recently
from
21ed04a to
7236dd9
Compare
peter-sanderson
commented
Jan 2, 2025
| @@ -24,14 +26,49 @@ else | |||
| echo "$STAGED_FILES" | |||
| echo "" | |||
|
|
|||
| # This will stashed all changes that are not added (the red files), but keeps added (the green files) | |||
| # echo -e "Stashing the ${GREEN}staged${NC} files." | |||
| git stash push --staged -q # Stash staged changes (green files) | |||
There was a problem hiding this comment.
--staged supported by git version 2.35+
peter-sanderson
force-pushed
the
pre-commit-hook-only-partial-files
branch
from
7236dd9 to
35abf43
Compare
peter-sanderson
force-pushed
the
pre-commit-hook-only-partial-files
branch
from
35abf43 to
d13fd28
Compare
|
FWIW I am against this. Those are potentially destructive actions that can cause our work to be lost, and the code is not trivial. IMHO we would need "unit tests", if we were to trust it. And I don't think it's worth the engineering effort to write unit tests in bash to test git operations on file system 🤷 On the other hand, the current I am aware of the problem this PR solves. I guess, that if you need to commit partially staged files, you have to remember to do it with |
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.
This PR tweaks the pre-commit hook to enable working with both staged and unstaged files.
In case you have staged changes on the file that you want to commit and then some other unstaged changes on the very same file, this fix will preserve the unstaged changes without committing them.
❗ 👉 The Git version at least
2.35is required for this to work. For older Ubuntu the git can be updated from this repository: https://launchpad.net/%7Egit-core/+archive/ubuntu/ppaThe unsolved issue is, that if you have staged and unstaged changes next to each other, it will produce conflict
Staged:
Unstaged:
Conflict: