gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-03 03:33:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix local branch name serialization

Browse Source
This commit is contained in:
Nikita Galaiko 2023-10-19 10:23:58 +02:00 committed by GitButler
parent 6bb05f8cc9
commit df098e8d57
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/tauri/src/git/branch/name/local.rs
View File

@ -26,7 +26,7 @@ impl Name {
impl Serialize for Name {
fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
serializer.serialize_str(&self.branch)
serializer.serialize_str(&self.to_string())
}
}

6
packages/tauri/src/virtual_branches/commands.rs
View File

@ -339,12 +339,16 @@ pub async fn can_apply_virtual_branch(
pub async fn can_apply_remote_branch(
handle: AppHandle,
project_id: &str,
branch: git::BranchName,
branch: &str,
) -> Result<bool, Error> {
let project_id = project_id.parse().map_err(|_| Error::UserError {
code: Code::Projects,
message: "Malformed project id".to_string(),
})?;
let branch = branch.parse().map_err(|_| Error::UserError {
code: Code::Branches,
message: "Malformed branch name".to_string(),
})?;
handle
.state::<Controller>()
.can_apply_remote_branch(&project_id, &branch)

1
packages/ui/src/lib/vbranches/types.ts
View File

@ -90,7 +90,6 @@ export class RemoteBranch {
sha!: string;
name!: string;
behind!: number;
upstream?: string;
@Type(() => RemoteCommit)
commits!: RemoteCommit[];
isMergeable!: Promise<boolean>;