summaryrefslogtreecommitdiff
path: root/internal/sync/sync.go
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2026-05-29 17:14:38 +0300
committerPaul Buetow <paul@buetow.org>2026-05-29 17:14:38 +0300
commite344b94d455712d9e753ef235bc6ff0e76fd91f2 (patch)
tree993268290262595107441b2a303e7797674d3e8c /internal/sync/sync.go
parentb076c5e2ac5403de28c5d0ba44fddf216f3034ce (diff)
fix(vq): restore version-prefix parsing and stash no-op handling
Diffstat (limited to 'internal/sync/sync.go')
-rw-r--r--internal/sync/sync.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/internal/sync/sync.go b/internal/sync/sync.go
index 949cb43..048803e 100644
--- a/internal/sync/sync.go
+++ b/internal/sync/sync.go
@@ -367,10 +367,11 @@ func (s *Syncer) handleWorkingDirectoryState() (bool, error) {
}
// If we have uncommitted changes but no conflicts, try to stash them
- if err := stashChanges(repoPath); err != nil {
+ stashed, err := stashChanges(repoPath)
+ if err != nil {
return false, fmt.Errorf("failed to stash changes: %w", err)
}
- return true, nil
+ return stashed, nil
}
// checkoutBranch checks out a branch, creating it if necessary