Skip to content

[AIR-3024] qs: merge Unstash and PopStashedFiles#130

Merged
host6 merged 1 commit intountillpro:mainfrom
host6:AIR-3024-qs-merge-Unstash-and-PopStashedFiles-pr
Feb 22, 2026
Merged

[AIR-3024] qs: merge Unstash and PopStashedFiles#130
host6 merged 1 commit intountillpro:mainfrom
host6:AIR-3024-qs-merge-Unstash-and-PopStashedFiles-pr

Conversation

@host6
Copy link
Collaborator

@host6 host6 commented Feb 22, 2026

AIR-3024 qs: merge Unstash and PopStashedFiles
https://untill.atlassian.net/browse/AIR-3024

@augmentcode
Copy link

augmentcode bot commented Feb 22, 2026

🤖 Augment PR Summary

Summary: This PR consolidates stash-pop behavior into a single Unstash() helper.

Changes:

  • Removed the dedicated stash-existence helper and the separate PopStashedFiles() function.
  • Updated Unstash() to first run git stash list and only git stash pop when entries exist.
  • Kept Stash() as the single entry point for stashing uncommitted changes.
  • Updated the fork workflow to call gitcmds.Unstash(wd) instead of PopStashedFiles.
  • Added an archived implementation note documenting the refactor.

Technical Notes: The new Unstash() avoids invoking stash pop when there are no stashes, reducing spurious errors in workflows that conditionally stash.

🤖 Was this summary useful? React with 👍 or 👎

Copy link

@augmentcode augmentcode bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review completed. No suggestions at this time.

Comment augment review to trigger a new review at any time.

@host6 host6 merged commit 5b04ce3 into untillpro:main Feb 22, 2026
0 of 3 checks passed
@host6 host6 deleted the AIR-3024-qs-merge-Unstash-and-PopStashedFiles-pr branch February 22, 2026 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant