fix some bugs

Author: wbbradley

src/git2_ops.rs

@@ -93,8 +93,21 @@ impl GitRepo {
         branch: &str,
     ) -> Result<GitBranchStatus> {
         let exists = self.branch_exists(branch);
+
+        // Resolve parent branch - use origin/<parent> if local doesn't exist
         let parent_branch = match parent_branch {
-            Some(parent_branch) => parent_branch.to_string(),
+            Some(parent_branch) => {
+                if self.branch_exists(parent_branch) {
+                    parent_branch.to_string()
+                } else {
+                    let remote_parent = format!("origin/{}", parent_branch);
+                    if self.ref_exists(&remote_parent) {
+                        remote_parent
+                    } else {
+                        parent_branch.to_string()
+                    }
+                }
+            }
             None => self.remote_main(DEFAULT_REMOTE)?,
         };
 
@@ -112,8 +125,16 @@ impl GitRepo {
             });
             (sha, is_descendent, upstream_status)
         } else {
-            // Branch doesn't exist - use placeholder values
-            (String::new(), false, None)
+            // Local branch doesn't exist - try using origin/<branch> instead
+            let remote_ref = format!("origin/{}", branch);
+            if self.ref_exists(&remote_ref) {
+                let sha = self.sha(&remote_ref).unwrap_or_default();
+                let is_descendent = self.is_ancestor(&parent_branch, &remote_ref).unwrap_or(false);
+                (sha, is_descendent, None)
+            } else {
+                // Neither local nor remote exists - use placeholder values
+                (String::new(), false, None)
+            }
         };
 
         Ok(GitBranchStatus {

src/state.rs

@@ -946,8 +946,9 @@ fn cleanup_tree_recursive(
     let mut indices_to_remove = Vec::new();
 
     for (index, child) in branch.branches.iter().enumerate() {
-        if !git_branch_exists(git_repo, &child.name) {
-            // This branch doesn't exist locally, mark it for removal
+        let remote_ref = format!("origin/{}", child.name);
+        if !git_branch_exists(git_repo, &child.name) && !git_repo.ref_exists(&remote_ref) {
+            // This branch doesn't exist locally or on remote, mark it for removal
             removed_branches.push(child.name.clone());
 
             // Collect its children to be adopted by the current branch