.

crates/signed_git/src/history.rs

@@ -72,17 +72,6 @@ fn file_commit_with_description(
     })
 }
 
-/// Find the most recent commit that changed `rel`, a path relative to the worktree.
-///
-/// `Ok(None)` when no commit touched the file, e.g. an untracked file.
-pub fn last_commit(repo: &gix::Repository, rel: &Path) -> Result<Option<FileCommit>> {
-    let rel = rel.to_path_buf();
-    Ok(last_commits(repo, std::slice::from_ref(&rel))?
-        .into_iter()
-        .next()
-        .map(|(_, commit)| commit))
-}
-
 /// Newest commit touching each of `rels`, like `git log -1 -- <rel>` per path.
 /// `rels` are paths relative to the worktree.
 ///

crates/signed_git/src/lib.rs

@@ -16,8 +16,8 @@ pub use diff::{
     worktree_commit_range_diff,
 };
 pub use history::{
-    CommitList, FileCommit, MAX_LISTED_COMMITS, all_commits, head_commit, last_commit,
-    worktree_all_commits, worktree_commit, worktree_commit_range_commits, worktree_last_commits,
+    CommitList, FileCommit, MAX_LISTED_COMMITS, all_commits, head_commit, worktree_all_commits,
+    worktree_commit, worktree_commit_range_commits, worktree_last_commits,
 };
 pub use patch::{
     apply_patch, format_patch_between, patch_commits, patch_diffs, split_patch_series,

crates/signed_git/src/repo.rs

@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use anyhow::{Context, Result, bail};
+use anyhow::{Context, Result};
 
 use crate::history::open_with_cache;
 use crate::worktree::{force_checkout, worktree_dirty};
@@ -171,12 +171,7 @@ pub fn init_repository(path: &Path, name: &str, description: &str) -> Result<Str
     let mut index = repo.index_from_tree(&tree)?;
     index.write(gix::index::write::Options::default())?;
 
-    let commit = commit.to_string();
-    if commit.len() != 40 {
-        bail!("unexpected initial commit id: {commit}");
-    }
-
-    Ok(commit)
+    Ok(commit.to_string())
 }
 
 /// The earliest unique commit of the repository at `repo_path`.
@@ -201,8 +196,7 @@ pub fn root_commit(repo_path: &Path) -> Result<Option<String>> {
     {
         let info = info?;
         if info.parent_ids().next().is_none() {
-            let id = info.id().to_string();
-            return Ok((id.len() == 40).then_some(id));
+            return Ok(Some(info.id().to_string()));
         }
     }
 

crates/signed_git/src/tests.rs

@@ -1,5 +1,5 @@
 use std::collections::HashMap;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use super::*;
@@ -578,7 +578,7 @@ fn git_run(dir: &Path, args: &[&str]) {
 }
 
 #[test]
-fn last_commit_returns_most_recent_change() {
+fn worktree_last_commits_returns_most_recent_change() {
     let (dir, repo) = fixture(&[("a.txt", b"one")]);
     commit_all(&repo, "initial");
 
@@ -589,9 +589,12 @@ fn last_commit_returns_most_recent_change() {
     std::fs::write(dir.path().join("b.txt"), b"other").expect("write");
     commit_all(&repo, "add b");
 
-    let commit = last_commit(&repo, Path::new("a.txt"))
+    let commit = worktree_last_commits(dir.path(), &[PathBuf::from("a.txt")])
         .expect("lookup")
-        .expect("found");
+        .into_iter()
+        .next()
+        .expect("found")
+        .1;
     assert_eq!(commit.summary, "change a");
     assert_eq!(commit.author, "Test Author");
     assert!(!commit.id.is_empty());
@@ -621,7 +624,7 @@ fn all_commits_lists_every_commit() {
 }
 
 #[test]
-fn last_commit_reports_merge_commits() {
+fn worktree_last_commits_reports_merge_commits() {
     let (dir, repo) = fixture(&[("a.txt", b"base")]);
     commit_all(&repo, "initial");
 
@@ -645,9 +648,12 @@ fn last_commit_reports_merge_commits() {
     // `--no-ff` forces a merge commit, it is the latest commit changing a.txt.
     run(&["merge", "--no-ff", "--no-edit", "feature"]);
 
-    let commit = last_commit(&repo, Path::new("a.txt"))
+    let commit = worktree_last_commits(dir.path(), &[PathBuf::from("a.txt")])
         .expect("lookup")
-        .expect("found");
+        .into_iter()
+        .next()
+        .expect("found")
+        .1;
     assert_eq!(
         commit.id,
         repo.head_id().expect("head").shorten_or_id().to_string()

crates/signed_git/src/worktree.rs

@@ -64,20 +64,10 @@ pub fn worktree_commits_ahead(workdir: &Path, base: &str, branch: &str) -> u32 {
     walk.filter_map(Result::ok).count().min(u32::MAX as usize) as u32
 }
 
-/// Resolve `rev` to a commit id, accepting full refs,
-/// symbolic refs and the bare branch names callers pass, like git's DWIM.
+/// Resolve `rev` to a commit id, accepting full refs or the bare branch names
+/// callers pass. `gix`'s revision parser already applies git's ref DWIM.
 fn resolve_commit<'a>(repo: &'a gix::Repository, rev: &str) -> Option<gix::Id<'a>> {
-    if let Ok(id) = repo.rev_parse_single(rev.as_bytes()) {
-        return Some(id);
-    }
-
-    // Branch names arrive bare, like git resolving `main`.
-    if rev.contains('/') {
-        return None;
-    }
-
-    repo.rev_parse_single(format!("refs/heads/{rev}").as_bytes())
-        .ok()
+    repo.rev_parse_single(rev.as_bytes()).ok()
 }
 
 /// Relative paths of all entries in the worktree, files and directories.