Update internal/controller/git/work_tree.go

Signed-off-by: Kent Rancourt <[email protected]> Co-authored-by: Hidde Beydals <[email protected]>
akuity · Dec 11, 2024 · 95f7f03 · 95f7f03
1 parent 0fac579
commit 95f7f03
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/internal/controller/git/work_tree.go b/internal/controller/git/work_tree.go
@@ -326,14 +326,20 @@ func (w *workTree) IsRebasing() (bool, error) {
 		return false, fmt.Errorf("error determining rebase status: %w", err)
 	}
 	rebaseMerge := filepath.Join(w.dir, strings.TrimSpace(string(res)))
-	if _, err = os.Stat(rebaseMerge); err == nil {
+	if _, err = os.Stat(rebaseMerge); !os.IsNotExist(err) {
+		if err != nil {
+			return false, err
+		}
 		return true, nil
 	}
 	if res, err = libExec.Exec(w.buildGitCommand("rev-parse", "--git-path", "rebase-apply")); err != nil {
 		return false, fmt.Errorf("error determining rebase status: %w", err)
 	}
 	rebaseApply := filepath.Join(w.dir, strings.TrimSpace(string(res)))
-	if _, err = os.Stat(rebaseApply); err == nil {
+	if _, err = os.Stat(rebaseApply); !os.IsNotExist(err) {
+		if err != nil {
+			return false, err
+		}
 		return true, nil
 	}
 	return false, nil