Add a test that merge-base is found correctly

And fix the fact that it wasn't :-(

Author: quodlibetor

src/main.rs

@@ -74,6 +74,7 @@ fn main() {
         if !msg.is_empty() {
             println!("Error: {}", e);
         }
+        std::process::exit(1);
     }
 }
 
@@ -128,18 +129,7 @@ fn get_upstream<'a>(
                     .unwrap_or(false)
             })
             .ok_or_else(|| format!("cannot find branch with name {:?}", upstream_name))?;
-        let result = Command::new("git")
-            .args(&[
-                "merge-base",
-                head_branch.name().unwrap().unwrap(),
-                branch.name().unwrap().unwrap(),
-            ])
-            .output()?
-            .stdout;
-        let oid = Oid::from_str(std::str::from_utf8(&result)?.trim())?;
-        let commit = repo.find_object(oid, None).unwrap();
-
-        commit
+        branch.into_reference().peel(ObjectType::Commit)?
     } else {
         if let Ok(upstream) = head_branch.upstream() {
             upstream.into_reference().peel(ObjectType::Commit)?
@@ -148,7 +138,18 @@ fn get_upstream<'a>(
         }
     };
 
-    Ok(Some(upstream))
+    let result = Command::new("git")
+        .args(&[
+            "merge-base",
+            head_branch.name().unwrap().unwrap(),
+            &upstream.id().to_string(),
+        ])
+        .output()?
+        .stdout;
+    let oid = Oid::from_str(std::str::from_utf8(&result)?.trim())?;
+    let commit = repo.find_object(oid, None).unwrap();
+
+    Ok(Some(commit))
 }
 
 fn create_fixup_commit<'a>(

tests/basic.rs

@@ -70,6 +70,66 @@ new
         err
     );
 }
+
+#[test]
+fn test_no_commit_in_range() {
+    let td = assert_fs::TempDir::new().unwrap();
+    git_init(&td);
+
+    for n in &["a", "b", "c", "d"] {
+        git_file_commit(n, &td);
+    }
+    git(&["checkout", "-b", "changes", ":/c"], &td);
+    git(&["branch", "-u", "main"], &td);
+    for n in &["e", "f", "g"] {
+        git_file_commit(&n, &td);
+    }
+
+    let out = git_log(&td);
+    assert_eq!(
+        out,
+        "\
+* g HEAD -> changes
+* f
+* e
+| * d main
+|/
+* c
+* b
+* a
+",
+        "log:\n{}",
+        out
+    );
+
+    td.child("new").touch().unwrap();
+    git(&["add", "new"], &td);
+
+    let assertion = fixup(&td).args(&["-P", "b"]).assert().failure();
+    let out = string(assertion.get_output().stdout.clone());
+    assert!(out.contains("No commit contains the pattern"), out);
+
+    fixup(&td).args(&["-P", "e"]).assert().success();
+
+    let shown = git_out(
+        &["diff-tree", "--no-commit-id", "--name-only", "-r", ":/e"],
+        &td,
+    );
+    let files = string(shown.stdout);
+    let err = string(shown.stderr);
+
+    assert_eq!(
+        files,
+        "\
+file_e
+new
+",
+        "out: {} err: {}",
+        files,
+        err
+    );
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Helpers