Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

git_ui: Fix creating worktree not possible if default branch unavailable (#57918)

Bennet Bo Fennerd74e47ea519a
diff --git a/crates/git_ui/src/worktree_picker.rs b/crates/git_ui/src/worktree_picker.rs
index 70219da3cac..4e6eec71914 100644
--- a/crates/git_ui/src/worktree_picker.rs
+++ b/crates/git_ui/src/worktree_picker.rs
@@ -420,18 +420,18 @@ impl WorktreePickerDelegate {
fn build_fixed_entries(&self) -> Vec<WorktreeEntry> {
let mut entries = Vec::new();
- if !self.has_multiple_repositories {
- if let Some(ref default_branch) = self.default_branch {
- let is_different = self
- .current_branch_name
- .as_ref()
- .is_none_or(|current| current != &default_branch.branch_name);
- entries.push(WorktreeEntry::CreateFromDefaultBranch {
- default_branch: default_branch.clone(),
- });
- if is_different {
- entries.push(WorktreeEntry::CreateFromCurrentBranch);
- }
+ if self.has_multiple_repositories {
+ entries.push(WorktreeEntry::CreateFromCurrentBranch);
+ } else if let Some(ref default_branch) = self.default_branch {
+ let is_different = self
+ .current_branch_name
+ .as_ref()
+ .is_none_or(|current| current != &default_branch.branch_name);
+ entries.push(WorktreeEntry::CreateFromDefaultBranch {
+ default_branch: default_branch.clone(),
+ });
+ if is_different {
+ entries.push(WorktreeEntry::CreateFromCurrentBranch);
}
} else {
entries.push(WorktreeEntry::CreateFromCurrentBranch);
@@ -1539,6 +1539,37 @@ mod tests {
});
}
+ #[gpui::test]
+ async fn test_current_branch_create_target_is_shown_without_default_branch(
+ cx: &mut TestAppContext,
+ ) {
+ let (_fs, worktree_picker, _repository, _worktree_path, mut cx) =
+ init_worktree_picker_test(cx).await;
+
+ worktree_picker.update_in(&mut cx, |worktree_picker, window, cx| {
+ worktree_picker.picker.update(cx, |picker, cx| {
+ picker.delegate.default_branch = None;
+ picker.refresh(window, cx);
+ });
+ });
+ cx.run_until_parked();
+
+ worktree_picker.update(&mut cx, |worktree_picker, cx| {
+ worktree_picker.picker.update(cx, |picker, _| {
+ assert!(matches!(
+ picker.delegate.matches.first(),
+ Some(WorktreeEntry::CreateFromCurrentBranch)
+ ));
+ assert!(
+ !picker.delegate.matches.iter().any(|entry| matches!(
+ entry,
+ WorktreeEntry::CreateFromDefaultBranch { .. }
+ ))
+ );
+ });
+ });
+ }
+
#[gpui::test]
async fn test_delete_dirty_worktree_prompts_for_force_delete(cx: &mut TestAppContext) {
let (fs, worktree_picker, repository, worktree_path, mut cx) =