Import/export bug fixes#5780
Merged
WithoutPants merged 2 commits intostashapp:developfrom Apr 1, 2025
Merged
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR fixes issues with importing/exporting tags by ensuring parent tags are included in the export and making exported basenames unique by appending a short hash. Key changes include:
- Introducing a recursive function to collect dependent (parent) tag IDs.
- Updating basename sanitization to include a short hash suffix for uniqueness.
- Adjusting export progress tracking to account for newly added tags.
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| pkg/tag/export.go | Adds a recursive function (GetDependentTagIDs) to include parent tags as dependencies in exports. |
| pkg/fsutil/file_test.go | Updates tests to expect the new hash suffix in sanitised basenames. |
| pkg/fsutil/file.go | Modifies SanitiseBasename to append a short hash to the cleaned basename for uniqueness. |
| internal/manager/task_export.go | Adjusts tag export progress tracking and includes dependency tags during export processing. |
XGFan
pushed a commit
to XGFan/stash
that referenced
this pull request
Oct 22, 2025
* Include parent tags in export if including dependencies * Handle uniqueness when sanitising filenames
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.
Fixes some issues while investigating #5775
includes parent tags in export if including depedencies
I had an issue where the import would fail because the parent tags weren't included in the export.
add short hash of basename as suffix when sanitising basenames
I had an issue where two tags with names
parentand#parentwould end up with the same filename.