Fix conditional stash pop in git hook script#3302
Open
Conversation
- Capture git stash push output to detect if stash was created - Only run git stash pop if a stash was actually created - Prevents popping unrelated stashes when no changes exist - Maintains same output formatting and user experience Co-authored-by: RichDom2185 <34370238+RichDom2185@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Custom git hook script should only conditionally pop stash
Fix conditional stash pop in git hook script
Aug 13, 2025
Pull Request Test Coverage Report for Build 17819161224Details
💛 - Coveralls |
Contributor
Contributor
|
I tested this and it works. Nits: (1) Output when testing with Ideally I'd prefer if (2) Script Would be nice if it was not duplicated |
This file contains hidden or 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
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.
The
scripts/test.shgit hook script was unconditionally popping the stash even when no stash was created, which could affect unrelated stashes or cause errors.The issue occurred because:
git stash push --keep-indexonly creates a stash when there are unstaged changesgit stash pop, potentially popping an unrelated stashThis fix captures the output of
git stash pushand only runsgit stash popwhen a stash was actually created (indicated by "Saved working directory" in the output).Before:
After:
The fix maintains the same output formatting and user experience while making the script more robust.
Fixes #3225.
Warning
Firewall rules blocked me from connecting to one or more addresses
I tried to connect to the following addresses, but was blocked by firewall rules:
cdn.sheetjs.comnode /usr/local/bin/yarn install(dns block)If you need me to access, download, or install something from one of these locations, you can either:
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.