Skip to content

Fix conditional stash pop in git hook script #3302

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
wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −4
Open

Fix conditional stash pop in git hook script #3302

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b48206
Initial plan
Copilot Aug 13, 2025
ad4870c
Fix conditional stash pop in test.sh script
Copilot Aug 13, 2025
28dd619
Merge branch 'master' into copilot/fix-3225
martin-henz Sep 18, 2025
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
21 changes: 17 additions & 4 deletions scripts/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
export CI=true

main() {
run_cmd "git stash push --keep-index --message precommit"
echo " If you cancel this pre-push hook, use \`git stash pop\` to retrieve your"
echo " unstaged changes."
stash_output=$(git stash push --keep-index --message precommit 2>&1)
echo_cyan "> git stash push --keep-index --message precommit"
if [[ ! -z "${stash_output}" ]]; then
echo "${stash_output}" | sed 's/^/ /'
fi

# Check if a stash was actually created
stash_created=false
if [[ "${stash_output}" == *"Saved working directory"* ]]; then
stash_created=true
echo " If you cancel this pre-push hook, use \`git stash pop\` to retrieve your"
echo " unstaged changes."
fi

tsc="yarn run tsc"
eslint="yarn run eslint"
Expand All @@ -19,7 +29,10 @@ main() {
run_cmd "${prettier_scss}"; prettier_scss_exit=$?
run_cmd_jest "${jest_ts}"; jest_ts_exit=$?

run_cmd "git stash pop"
# Only pop the stash if we actually created one
if [[ "${stash_created}" == true ]]; then
run_cmd "git stash pop"
fi

( >&2
echo -ne "\033[0;31m"
Expand Down
Loading