gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-19 15:41:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3714 from gitbutlerapp/fix-race-condition-issue

Browse Source 
fixes a possible condition where if integration commit is not found a…
This commit is contained in:
Kiril Videlov 2024-05-07 00:16:50 +02:00 committed by GitHub
commit 5bfb3395a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/gitbutler-core/src/virtual_branches/integration.rs
View File

@ -303,11 +303,13 @@ fn verify_head_is_clean(
.peel_to_commit() .peel_to_commit()
.context("failed to peel to commit")?; .context("failed to peel to commit")?;
let vb_handle = VirtualBranchesHandle::new(project_repository.project().gb_dir());
let default_target = vb_handle
.get_default_target()
.context("failed to get default target")?;
let mut extra_commits = project_repository let mut extra_commits = project_repository
.log( .log(head_commit.id(), LogUntil::Commit(default_target.sha))
head_commit.id(),
LogUntil::When(Box::new(|commit| Ok(is_integration_commit(commit)))),
)
.context("failed to get log")?; .context("failed to get log")?;
let integration_commit = extra_commits.pop(); let integration_commit = extra_commits.pop();
@ -402,29 +404,3 @@ fn verify_head_is_set(
Some(head_name) => Err(errors::VerifyError::InvalidHead(head_name.to_string())), Some(head_name) => Err(errors::VerifyError::InvalidHead(head_name.to_string())),
} }
} }
fn is_integration_commit(commit: &git::Commit) -> bool {
is_integration_commit_author(commit) && is_integration_commit_message(commit)
}
fn is_integration_commit_author(commit: &git::Commit) -> bool {
is_integration_commit_author_email(commit) && is_integration_commit_author_name(commit)
}
fn is_integration_commit_author_email(commit: &git::Commit) -> bool {
commit.author().email().map_or(false, |email| {
email == GITBUTLER_INTEGRATION_COMMIT_AUTHOR_EMAIL
})
}
fn is_integration_commit_author_name(commit: &git::Commit) -> bool {
commit.author().name().map_or(false, |name| {
name == GITBUTLER_INTEGRATION_COMMIT_AUTHOR_NAME
})
}
fn is_integration_commit_message(commit: &git::Commit) -> bool {
commit
.message()
.starts_with(b"GitButler Integration Commit")
}