2 files changed, 49 insertions, 2 deletions

diff --git a/test_utils/src/git.rs b/test_utils/src/git.rs
index a18f81c..2668b3f 100644
--- a/test_utils/src/git.rs
+++ b/test_utils/src/git.rs
@@ -276,6 +276,49 @@ impl GitTestRepo {
         Ok(())
     }
 
+    /// Creates a git worktree linked to this repository.
+    /// Returns a `GitTestRepo` whose `dir` points to the worktree working
+    /// directory.
+    pub fn create_worktree(&self, branch_name: &str) -> Result<GitTestRepo> {
+        let worktree_path = self
+            .dir
+            .parent()
+            .unwrap()
+            .join(format!("tmpgit-worktree-{}", rand::random::<u64>()));
+
+        // Create the branch at the current HEAD
+        let head_commit = self.git_repo.head()?.peel_to_commit()?;
+        self.git_repo
+            .branch(branch_name, &head_commit, false)
+            .context("failed to create branch for worktree")?;
+
+        // Add worktree via git2
+        let worktree = self
+            .git_repo
+            .worktree(
+                branch_name,
+                &worktree_path,
+                Some(
+                    git2::WorktreeAddOptions::new().reference(Some(
+                        &self
+                            .git_repo
+                            .find_branch(branch_name, git2::BranchType::Local)?
+                            .into_reference(),
+                    )),
+                ),
+            )
+            .context("failed to create worktree")?;
+
+        let worktree_repo = git2::Repository::open_from_worktree(&worktree)
+            .context("failed to open repo from worktree")?;
+
+        Ok(GitTestRepo {
+            dir: worktree_path,
+            git_repo: worktree_repo,
+            delete_dir_on_drop: true,
+        })
+    }
+
     pub fn checkout_remote_branch(&self, branch_name: &str) -> Result<Oid> {
         self.checkout(&format!("remotes/origin/{branch_name}"))?;
         let mut branch = self.create_branch(branch_name)?;
diff --git a/test_utils/src/lib.rs b/test_utils/src/lib.rs
index 48273e8..89cbaa9 100644
--- a/test_utils/src/lib.rs
+++ b/test_utils/src/lib.rs
@@ -1208,8 +1208,12 @@ where
 
 /** copied from client.rs */
 async fn get_local_cache_database(git_repo_path: &Path) -> Result<NostrLMDB> {
-    NostrLMDB::open(git_repo_path.join(".git/nostr-cache.lmdb"))
-        .context("failed to open or create nostr cache database at .git/nostr-cache.lmdb")
+    let git_dir = git2::Repository::discover(git_repo_path)
+        .context("failed to discover git repository")?
+        .commondir()
+        .to_path_buf();
+    NostrLMDB::open(git_dir.join("nostr-cache.lmdb"))
+        .context("failed to open or create nostr cache database at <git-dir>/nostr-cache.lmdb")
 }
 
 /** copied from client.rs */