Skip to content

fix(husky): stage server files from worktree root in pre-commit hook #41835

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

Open
wyattwalter wants to merge 1 commit into
base: release
Choose a base branch
from
+7 −5
Open

fix(husky): stage server files from worktree root in pre-commit hook #41835

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
12 changes: 7 additions & 5 deletions app/client/.husky/check-staged-files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ is_client_change=$(git diff --cached --name-only | grep -c "app/client")

is_merge_commit=$(git rev-parse -q --verify MERGE_HEAD)

# Function to apply Spotless and only commit staged files
# Function to apply Spotless and only commit staged files.
# Runs mvn in a subshell so we don't pushd the script's cwd into app/server.
# Staging from the worktree root with full paths avoids a worktree-only bug:
# git invokes hooks with GIT_DIR set but GIT_WORK_TREE unset, so `git add` from
# a subdirectory treats cwd as the worktree root and stages files at the wrong path.
apply_spotless_and_commit_staged_files() {
staged_server_files=$(git diff --cached --name-only | grep "app/server"| sed 's|app/server/||')
mvn spotless:apply
staged_server_files=$(git diff --cached --name-only | grep "app/server")
(cd app/server && mvn spotless:apply)
# Check if Spotless succeeded
if [ $? -ne 0 ]; then
echo "Spotless apply failed, Please run mvn spotless:apply"
Expand All @@ -23,9 +27,7 @@ if [ "$is_merge_commit" ]; then
else
if [ "$is_server_change" -ge 1 ]; then
echo "Applying Spotless to server files..."
pushd app/server > /dev/null
apply_spotless_and_commit_staged_files
popd > /dev/null
else
echo "Skipping server side check..."
fi
Expand Down
Loading