Fix create_worktree callsite types after merge with main
Richard Feldman
created
The git_store::Repository::create_worktree wrapper takes String (not
Option<String>), but the merge left test callsites passing Some(...).
Change summary
crates/collab/tests/integration/git_tests.rs | 4
crates/collab/tests/integration/remote_editing_collaboration_tests.rs | 2
2 files changed, 3 insertions(+), 3 deletions(-)
Detailed changes
@@ -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,
)
@@ -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()),
)