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

Fixes a bug when validating stack target commit

Browse Source
This commit is contained in:
Kiril Videlov 2024-10-08 22:24:34 +02:00
parent 1aa47d00f2
commit 915acd6afb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/gitbutler-stack-api/src/stack_ext.rs
View File

@ -591,9 +591,14 @@ fn commit_by_branch_id_and_change_id<'a>(
) -> Result<git2::Commit<'a>> { ) -> Result<git2::Commit<'a>> {
// Find the commit with the change id // Find the commit with the change id
let merge_base = ctx.repository().merge_base(stack_head, target_sha)?; let merge_base = ctx.repository().merge_base(stack_head, target_sha)?;
let commit = ctx
.repository() let commits = if stack_head == merge_base {
vec![ctx.repository().find_commit(stack_head)?]
} else {
ctx.repository()
.log(stack_head, LogUntil::Commit(merge_base))? .log(stack_head, LogUntil::Commit(merge_base))?
};
let commit = commits
.iter() .iter()
.map(|c| c.id()) .map(|c| c.id())
.find(|c| { .find(|c| {