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.

Fix creating branch with base in remote (#55387)

boaz-h648f79201927
diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index 8956345c68e..b30b943d032 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -2753,10 +2753,11 @@ impl GitStore {
let repository_id = RepositoryId::from_proto(envelope.payload.repository_id);
let repository_handle = Self::repository_for_request(&this, repository_id, &mut cx)?;
let branch_name = envelope.payload.branch_name;
+ let base_branch = envelope.payload.base_branch;
repository_handle
.update(&mut cx, |repository_handle, _| {
- repository_handle.create_branch(branch_name, None)
+ repository_handle.create_branch(branch_name, base_branch)
})
.await??;
@@ -7033,6 +7034,7 @@ impl Repository {
project_id: project_id.0,
repository_id: id.to_proto(),
branch_name,
+ base_branch,
})
.await?;
diff --git a/crates/proto/proto/git.proto b/crates/proto/proto/git.proto
index 9d583a166c9..cea288ea2a0 100644
--- a/crates/proto/proto/git.proto
+++ b/crates/proto/proto/git.proto
@@ -180,6 +180,7 @@ message GitCreateBranch {
reserved 2;
uint64 repository_id = 3;
string branch_name = 4;
+ optional string base_branch = 5;
}
message GitChangeBranch {