Skip to content

Only call 'git stash pop' when there were any stashed changes. #101

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 15, 2025
Merged

Only call 'git stash pop' when there were any stashed changes. #101

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
11 changes: 9 additions & 2 deletions src/stack_pr/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1623,9 +1623,16 @@ def main() -> None: # noqa: PLR0912

current_branch = get_current_branch_name()
get_branch_name_base(common_args.branch_name_template)
stashed_changes = False
try:
if args.command in ["submit", "export"] and args.stash:
run_shell_command(["git", "stash", "save"], quiet=not common_args.verbose)
result = run_shell_command(
["git", "stash", "save"], quiet=not common_args.verbose
)
# Check if stash actually saved anything
# git stash outputs "No local changes to save" when there's nothing to stash
output = result.stdout.decode() if result.stdout else ""
stashed_changes = "No local changes to save" not in output

if args.command != "view" and not is_repo_clean():
error(ERROR_REPO_DIRTY)
Expand Down Expand Up @@ -1659,7 +1666,7 @@ def main() -> None: # noqa: PLR0912
print_cmd_failure_details(exc)
raise
finally:
if args.command in ["submit", "export"] and args.stash:
if args.command in ["submit", "export"] and args.stash and stashed_changes:
run_shell_command(["git", "stash", "pop"], quiet=not common_args.verbose)


Expand Down
Loading