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

fixes a situation in which listing of snapshots fails

Browse Source
This commit is contained in:
Kiril Videlov 2024-07-20 15:51:46 +02:00
parent ea5079b723
commit 0e9b8c2957
No known key found for this signature in database
GPG Key ID: A4C733025427C471
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/gitbutler-oplog/src/oplog.rs
View File

@ -867,10 +867,23 @@ fn tree_from_applied_vbranches(
for branch in applied_branch_trees { for branch in applied_branch_trees {
let branch_tree = repo.find_tree(branch)?; let branch_tree = repo.find_tree(branch)?;
let mut workdir_temp_index = let mut merge_options: git2::MergeOptions = git2::MergeOptions::new();
repo.merge_trees(&base_tree, &current_ours, &branch_tree, None)?; merge_options.fail_on_conflict(false);
workdir_tree_id = workdir_temp_index.write_tree_to(repo)?; let mut workdir_temp_index = repo.merge_trees(
current_ours = repo.find_tree(workdir_tree_id)?; &base_tree,
&current_ours,
&branch_tree,
Some(&merge_options),
)?;
match workdir_temp_index.write_tree_to(repo) {
Ok(id) => {
workdir_tree_id = id;
current_ours = repo.find_tree(workdir_tree_id)?;
}
Err(_err) => {
tracing::warn!("Failed to merge tree {branch} - this branch is probably applied at a time when it should not be");
}
}
} }
Ok(workdir_tree_id) Ok(workdir_tree_id)