Tweaks & increment version

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "autorebase"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Tim Hutt <timh@graphcore.ai>"]
 edition = "2018"
 license = "MIT"

src/lib.rs

@@ -404,10 +404,8 @@ fn get_branches(repo_path: &Path) -> Result<Vec<BranchInfo>> {
                 worktree,
             })
         })
-        .filter(|branch| match branch {
-            Ok(b) if b.branch == TEMPORARY_BRANCH_NAME => false,
-            _ => true,
-        })
+        // This temporary branch should have been deleted but filter it out just in case something went wrong.
+        .filter(|branch| !matches!(branch, Ok(b) if b.branch == TEMPORARY_BRANCH_NAME))
         .collect::<Result<_, _>>()?;
     Ok(branches)
 }

tests/utils/mod.rs

@@ -62,7 +62,7 @@ pub struct CommitDescription {
     message: String,
     /// Map from filename to the new contents or None to delete it.
     changes: HashMap<String, Option<String>>,
-    /// Branch names on this commit.
+    /// Branch names on this commit, and their upstream branch if any.
     branches: Vec<(String, Option<String>)>,
     /// Child commits.
     children: Vec<CommitDescription>,