AlexandClaude Opus 4.7
2f646ee154
lint-staged uses git stash internally to isolate staged files for linting. During a merge/rebase/cherry-pick/revert, that stash machinery interacts catastrophically with MERGE_HEAD and friends — on any lint failure it resets, silently wiping MERGE_HEAD and your conflict resolutions. The user ends up in a loop where every merge attempt leaves a clean tree with no merge commit. This adds an early-exit guard for the four mid-operation states, and also anchors the script to the repo root + scopes each lint-staged run in a subshell so a subdir commit or per-package failure can't poison the cwd for the next step. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
24 lines
892 B
Bash
Executable File
24 lines
892 B
Bash
Executable File
#!/bin/sh
|
|
|
|
# Skip during merge/rebase/cherry-pick/revert. lint-staged's internal
|
|
# git-stash mechanism is incompatible with these states and will silently
|
|
# wipe MERGE_HEAD and your conflict resolutions on commit failure.
|
|
git_dir=$(git rev-parse --git-dir)
|
|
if [ -e "$git_dir/MERGE_HEAD" ] \
|
|
|| [ -e "$git_dir/CHERRY_PICK_HEAD" ] \
|
|
|| [ -e "$git_dir/REVERT_HEAD" ] \
|
|
|| [ -d "$git_dir/rebase-merge" ] \
|
|
|| [ -d "$git_dir/rebase-apply" ]; then
|
|
echo "Skipping lint-staged (mid merge/rebase/cherry-pick/revert)"
|
|
exit 0
|
|
fi
|
|
|
|
# Anchor to repo root so commits made from a subdirectory still work, and
|
|
# run each package's lint-staged in a subshell so cwd is scoped (a failure
|
|
# inside one package can't poison the cwd for the next).
|
|
cd "$(git rev-parse --show-toplevel)" || exit 1
|
|
|
|
echo "Running lint-staged..."
|
|
(cd client && npx lint-staged) || exit 1
|
|
(cd server && npx lint-staged) || exit 1
|