From ee2486025003ad00ac407b0f35eb4ffb0e9d2025 Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Wed, 1 Apr 2026 15:28:11 -0400 Subject: [PATCH] Fix create_worktree callsite types after merge with main The git_store::Repository::create_worktree wrapper takes String (not Option), but the merge left test callsites passing Some(...). --- crates/collab/tests/integration/git_tests.rs | 4 ++-- .../tests/integration/remote_editing_collaboration_tests.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/collab/tests/integration/git_tests.rs b/crates/collab/tests/integration/git_tests.rs index 50ce3dddc7f606f1af0f6cb21b7b99d9a1e7c61e..4af1355352554ee6e3350806cefe0b4cd41cf5d6 100644 --- a/crates/collab/tests/integration/git_tests.rs +++ b/crates/collab/tests/integration/git_tests.rs @@ -214,7 +214,7 @@ async fn test_remote_git_worktrees( cx_b.update(|cx| { repo_b.update(cx, |repository, _| { repository.create_worktree( - Some("feature-branch".to_string()), + "feature-branch".to_string(), worktree_directory.join("feature-branch"), Some("abc123".to_string()), ) @@ -268,7 +268,7 @@ async fn test_remote_git_worktrees( cx_b.update(|cx| { repo_b.update(cx, |repository, _| { repository.create_worktree( - Some("bugfix-branch".to_string()), + "bugfix-branch".to_string(), worktree_directory.join("bugfix-branch"), None, ) diff --git a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs index 570d8982445cbca93e2b993546cea5446535fc01..fe93a06f7265d102d8727466c46e83daf066e506 100644 --- a/crates/collab/tests/integration/remote_editing_collaboration_tests.rs +++ b/crates/collab/tests/integration/remote_editing_collaboration_tests.rs @@ -473,7 +473,7 @@ async fn test_ssh_collaboration_git_worktrees( cx_b.update(|cx| { repo_b.update(cx, |repo, _| { repo.create_worktree( - Some("feature-branch".to_string()), + "feature-branch".to_string(), worktree_directory.join("feature-branch"), Some("abc123".to_string()), )