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

Merge pull request #3708 from gitbutlerapp/fix-spinny

Browse Source 
fixes a bug where after updating the workspace the app shows infinite…
This commit is contained in:
Kiril Videlov 2024-05-06 18:34:38 +02:00 committed by GitHub
commit 9ca080c940
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1792,9 +1792,19 @@ fn get_applied_status(
let commit_id = git::Oid::from(blame_hunk.orig_commit_id());
if commit_id != *target_sha && commit_id != *integration_commit {
let hash = Hunk::hash_diff(hunk.diff_lines.as_ref());
let branch_id = uuid::Uuid::parse_str(
&commit_to_branch.get(&commit_id).unwrap().to_string(),
)?;
let id = commit_to_branch.get(&commit_id).map(|id| id.to_string());
let branch_id = if let Some(id) = id {
uuid::Uuid::parse_str(&id)?
} else {
// Log the error and continue
// TODO: Why does that happen?
tracing::error!(
"commit {:?} not found in commit_to_branch map {:?}",
commit_id,
commit_to_branch
);
continue;
};
let hunk_lock = diff::HunkLock {
branch_id,
commit_id,