gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-27 09:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

rm gb_repository from go_back_to_integration

Browse Source
This commit is contained in:
Kiril Videlov 2024-04-19 22:43:26 +02:00
parent 676fb0e8fa
commit 21fdfb4272
No known key found for this signature in database
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/gitbutler-core/src/virtual_branches/base.rs
View File

@ -50,7 +50,6 @@ pub fn get_base_branch_data(
} }
fn go_back_to_integration( fn go_back_to_integration(
gb_repository: &gb_repository::Repository,
project_repository: &project_repository::Repository, project_repository: &project_repository::Repository,
default_target: &target::Target, default_target: &target::Target,
) -> Result<super::BaseBranch, errors::SetBaseBranchError> { ) -> Result<super::BaseBranch, errors::SetBaseBranchError> {
@ -131,7 +130,7 @@ pub fn set_base_branch(
// if target exists, and it is the same as the requested branch, we should go back // if target exists, and it is the same as the requested branch, we should go back
if let Some(target) = gb_repository.default_target()? { if let Some(target) = gb_repository.default_target()? {
if target.branch.eq(target_branch_ref) { if target.branch.eq(target_branch_ref) {
return go_back_to_integration(gb_repository, project_repository, &target); return go_back_to_integration(project_repository, &target);
} }
} }