fix: ensure stash cleanup#302
Merged
Merged
Conversation
jdx
force-pushed
the
fix-unstaged
branch
3 times, most recently
from
8aab876 to
4bbb778
Compare
…n committing from subdir
jdx
changed the title
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
jdx
changed the title
Merged
jdx
added a commit
that referenced
this pull request
Sep 22, 2025
## [1.15.5](https://github.com/jdx/hk/compare/v1.15.4..v1.15.5) - 2025-09-22 ### 🐛 Bug Fixes - ensure stash cleanup by [@jdx](https://github.com/jdx) in [#302](#302) Co-authored-by: mise-en-dev <123107610+mise-en-dev@users.noreply.github.com>
Merged
1 task
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Sep 24, 2025
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [hk](https://github.com/jdx/hk) | minor | `1.13.7` -> `1.15.5` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>jdx/hk (hk)</summary> ### [`v1.15.5`](https://github.com/jdx/hk/blob/HEAD/CHANGELOG.md#1155---2025-09-22) [Compare Source](jdx/hk@v1.15.4...v1.15.5) ##### 🐛 Bug Fixes - ensure stash cleanup by [@​jdx](https://github.com/jdx) in [#​302](jdx/hk#302) ### [`v1.15.4`](https://github.com/jdx/hk/blob/HEAD/CHANGELOG.md#1154---2025-09-22) [Compare Source](jdx/hk@v1.15.3...v1.15.4) ##### 🐛 Bug Fixes - scope staging to step job files to avoid unrelated file commits; add lockfile regression test by [@​jdx](https://github.com/jdx) in [#​300](jdx/hk#300) ### [`v1.15.3`](https://github.com/jdx/hk/blob/HEAD/CHANGELOG.md#1153---2025-09-21) [Compare Source](jdx/hk@v1.15.2...v1.15.3) ##### 🐛 Bug Fixes - prevent duplicate \_type fields in JSON cache for groups by [@​jdx](https://github.com/jdx) in [#​297](jdx/hk#297) - add top-level exclude property to hk.pkl by [@​jdx](https://github.com/jdx) in [#​299](jdx/hk#299) ### [`v1.15.2`](https://github.com/jdx/hk/blob/HEAD/CHANGELOG.md#1152---2025-09-20) [Compare Source](jdx/hk@v1.15.1...v1.15.2) ##### 🐛 Bug Fixes - prettier bugs; stash/unstash robustness; preserve EOF newline by [@​jdx](https://github.com/jdx) in [#​293](jdx/hk#293) ##### 📚 Documentation - remove references to alternative config formats by [@​jdx](https://github.com/jdx) in [5e497b6](jdx/hk@5e497b6) ### [`v1.15.1`](https://github.com/jdx/hk/blob/HEAD/CHANGELOG.md#1151---2025-09-19) [Compare Source](jdx/hk@v1.15.0...v1.15.1) ##### 🐛 Bug Fixes - Skip any hunks that begin before the current position to avoid partial re-application by [@​jdx](https://github.com/jdx) in [8325a66](jdx/hk@8325a66) ### [`v1.15.0`](https://github.com/jdx/hk/blob/HEAD/CHANGELOG.md#1150---2025-09-19) [Compare Source](jdx/hk@v1.14.0...v1.15.0) ##### 🚀 Features - **(docs)** add custom VitePress theme with unique branding by [@​jdx](https://github.com/jdx) in [#​287](jdx/hk#287) ##### 🐛 Bug Fixes - handle fixes and unstaged hunks in the same file by [@​jdx](https://github.com/jdx) in [#​283](jdx/hk#283) ##### 📦️ Dependency Updates - pin dependencies by [@​renovate\[bot\]](https://github.com/renovate\[bot]) in [#​288](jdx/hk#288) - update actions/checkout action to v5 by [@​renovate\[bot\]](https://github.com/renovate\[bot]) in [#​289](jdx/hk#289) - update actions/download-artifact action to v5 by [@​renovate\[bot\]](https://github.com/renovate\[bot]) in [#​290](jdx/hk#290) - update actions/upload-pages-artifact action to v4 by [@​renovate\[bot\]](https://github.com/renovate\[bot]) in [#​291](jdx/hk#291) ### [`v1.14.0`](https://github.com/jdx/hk/blob/HEAD/CHANGELOG.md#1140---2025-09-18) [Compare Source](jdx/hk@v1.13.7...v1.14.0) ##### 🚀 Features - centralized settings registry with codegen by [@​jdx](https://github.com/jdx) in [#​284](jdx/hk#284) ##### 🔍 Other Changes - removed snapshot file by [@​bhanuprasad14](https://github.com/bhanuprasad14) in [0952af5](jdx/hk@0952af5) - Extract Pkl error handling into separate method by [@​jdx](https://github.com/jdx) in [e62cb24](jdx/hk@e62cb24) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xMTYuNiIsInVwZGF0ZWRJblZlciI6IjQxLjEyMi4zIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
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
1 participant
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.
Ensure hk drops the created stash entry so git stash is empty after pre-commit; track the stash commit and drop that specific ref; use it for show/cat-file; add Bats assertions to verify stash list is empty after commit; remove obsolete test asserting no stash when committing from subdir; fix guard test to expand PKL_PATH; CI is green.