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 reset_branch

Browse Source
This commit is contained in:
Kiril Videlov 2024-04-19 22:51:07 +02:00
parent b6c6159b1b
commit a7219d38f2
No known key found for this signature in database
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/gitbutler-core/src/virtual_branches/controller.rs
View File

@ -761,13 +761,8 @@ impl ControllerInner {
) -> Result<(), Error> {
let _permit = self.semaphore.acquire().await;
self.with_verify_branch(project_id, |gb_repository, project_repository, _| {
super::reset_branch(
gb_repository,
project_repository,
branch_id,
target_commit_oid,
)
self.with_verify_branch(project_id, |_, project_repository, _| {
super::reset_branch(project_repository, branch_id, target_commit_oid)
.map_err(Into::into)
})
}

1
crates/gitbutler-core/src/virtual_branches/virtual.rs
View File

@ -1976,7 +1976,6 @@ fn virtual_hunks_to_virtual_files(
// reset virtual branch to a specific commit
pub fn reset_branch(
gb_repository: &gb_repository::Repository,
project_repository: &project_repository::Repository,
branch_id: &BranchId,
target_commit_oid: git::Oid,