Merge pull request #1139 from gitbutlerapp/fix-names

fix branch name conversion
This commit is contained in:
Nikita Galaiko 2023-09-01 13:18:10 +02:00 committed by GitHub
commit 01a4c8a796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -462,7 +462,7 @@ pub fn target_to_base_branch(
.collect::<Result<Vec<_>>>()?;
let base = super::BaseBranch {
branch_name: target.branch.branch().to_string(),
branch_name: format!("{}/{}", target.branch.remote(), target.branch.branch()),
remote_name: target.branch.remote().to_string(),
remote_url: target.remote_url.clone(),
base_sha: target.sha.to_string(),