fix(vq): handle ignored stash/pop and parse errors explicitly

3 files changed, 55 insertions, 3 deletions

diff --git a/internal/sync/git_operations.go b/internal/sync/git_operations.go
index 08eea34..1acfb95 100644
--- a/internal/sync/git_operations.go
+++ b/internal/sync/git_operations.go
@@ -43,8 +43,13 @@ func stashChanges(repoPath string) error {
 }
 
 // popStash attempts to pop the stash (used in defer)
-func popStash(repoPath string) {
-	gitCommand(repoPath, "stash", "pop").Run()
+func popStash(repoPath string) error {
+	output, err := gitCommand(repoPath, "stash", "pop").CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("failed to restore stashed changes: %w\n%s", err, strings.TrimSpace(string(output)))
+	}
+
+	return nil
 }
 
 // mergeBranch merges a branch from a remote
diff --git a/internal/sync/git_operations_test.go b/internal/sync/git_operations_test.go
index e696fb7..b80bf0e 100644
--- a/internal/sync/git_operations_test.go
+++ b/internal/sync/git_operations_test.go
@@ -1,7 +1,9 @@
 package sync
 
 import (
+	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"testing"
 )
@@ -77,6 +79,47 @@ func TestGetTagCommitHash_LocalTagMissingReturnsError(t *testing.T) {
 	}
 }
 
+func TestPopStash_NoStashReturnsError(t *testing.T) {
+	repoPath := t.TempDir()
+	runGit(t, repoPath, "init")
+
+	if err := popStash(repoPath); err == nil {
+		t.Fatal("expected error when popping stash with no entries")
+	}
+}
+
+func TestPopStash_RestoresStashedChanges(t *testing.T) {
+	repoPath := t.TempDir()
+
+	runGit(t, repoPath, "init")
+	runGit(t, repoPath, "config", "user.name", "Test User")
+	runGit(t, repoPath, "config", "user.email", "test@example.com")
+
+	trackedFile := filepath.Join(repoPath, "tracked.txt")
+	if err := os.WriteFile(trackedFile, []byte("first\n"), 0o644); err != nil {
+		t.Fatalf("write tracked file: %v", err)
+	}
+	runGit(t, repoPath, "add", "tracked.txt")
+	runGit(t, repoPath, "commit", "-m", "initial")
+
+	if err := os.WriteFile(trackedFile, []byte("second\n"), 0o644); err != nil {
+		t.Fatalf("update tracked file: %v", err)
+	}
+	runGit(t, repoPath, "stash", "push", "-m", "test-stash")
+
+	if err := popStash(repoPath); err != nil {
+		t.Fatalf("expected popStash to succeed, got error: %v", err)
+	}
+
+	content, err := os.ReadFile(trackedFile)
+	if err != nil {
+		t.Fatalf("read tracked file: %v", err)
+	}
+	if string(content) != "second\n" {
+		t.Fatalf("expected stashed content to be restored, got %q", string(content))
+	}
+}
+
 func runGit(t *testing.T, repoPath string, args ...string) string {
 	t.Helper()
 
diff --git a/internal/sync/sync.go b/internal/sync/sync.go
index 2f05110..949cb43 100644
--- a/internal/sync/sync.go
+++ b/internal/sync/sync.go
@@ -324,7 +324,11 @@ func (s *Syncer) syncBranch(branch string, remotes map[string]*config.Organizati
 		return err
 	}
 	if stashed {
-		defer popStash(repoPath)
+		defer func() {
+			if err := popStash(repoPath); err != nil {
+				fmt.Printf("  Warning: %v\n", err)
+			}
+		}()
 	}
 
 	// Create or checkout the branch