more durable fetch by trying all first and falling back to individual fetches

Author: skarim

internal/git/gitops.go

@@ -108,12 +108,30 @@ func (d *defaultOps) Fetch(remote string) error {
 }
 
 func (d *defaultOps) FetchBranches(remote string, branches []string) error {
-	if len(branches) == 0 {
+	// Only fetch branches that already have a remote tracking ref.
+	var tracked []string
+	for _, b := range branches {
+		ref := fmt.Sprintf("refs/remotes/%s/%s", remote, b)
+		if err := runSilent("rev-parse", "--verify", "--quiet", ref); err == nil {
+			tracked = append(tracked, b)
+		}
+	}
+	if len(tracked) == 0 {
 		return nil
 	}
+	// Fast path: fetch all tracked branches in a single call.
 	args := []string{"fetch", remote}
-	args = append(args, branches...)
-	return runSilent(args...)
+	args = append(args, tracked...)
+	if err := runSilent(args...); err == nil {
+		return nil
+	}
+	// Fallback: a ref may have been deleted on the remote while the
+	// local tracking ref still exists. Fetch branches individually so
+	// one missing ref doesn't block the others.
+	for _, b := range tracked {
+		_ = runSilent("fetch", remote, b)
+	}
+	return nil
 }
 
 func (d *defaultOps) DefaultBranch() (string, error) {