gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-10-06 08:58:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

move snapshot MergeUpstream to before the operation

Browse Source
This commit is contained in:
Kiril Videlov 2024-05-23 11:48:56 +02:00
parent a65aec6054
commit f94ff8fd41
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,12 +576,11 @@ impl ControllerInner {
let _permit = self.semaphore.acquire().await;
self.with_verify_branch(project_id, |project_repository, user| {
let result = super::integrate_upstream_commits(project_repository, branch_id, user)
.map_err(Into::into);
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationType::MergeUpstream));
result
super::integrate_upstream_commits(project_repository, branch_id, user)
.map_err(Into::into)
})
}