Skip to content

Revert "chore(monorepo): stash in pre-commit to avoid all changes to partially commited files to end up in commit" #7565

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 13, 2025
Merged

Revert "chore(monorepo): stash in pre-commit to avoid all changes to partially commited files to end up in commit" #7565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@
# listings staged files only
fileList=$(git diff --diff-filter=AM --cached --name-only)

# making sure that pre-commit hook preserves the partial commits where only some
# hunks are staged for commit
# 1. stash only staged files first (there's no option to stash only uncommited
# files, so we have to reverse the logic)
git stash --staged -m "pre-commit hook: staged" -q
# 2. stash everything that's left
git stash -m "pre-commit hook: unstaged" -q
# 3. restore staged state
git stash pop stash@{1} -q

# when script exits, pop the stash with unstaged files
trap "git stash pop -q" EXIT

if [ -n "$fileList" ]; then
echo "Prettifying staged files..."
npx prettier-compass --write --ignore-unknown $fileList
Expand Down
Loading