We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent e7e8ffd commit be950b1Copy full SHA for be950b1
crates/gitbutler-stack/src/stack.rs
@@ -530,7 +530,10 @@ impl Stack {
530
let head_commit = repo
531
.find_reference(&head.remote_reference(&remote_name)?)?
532
.peel_to_commit()?;
533
- let merge_base = repo.merge_base(head_commit.id(), default_target.sha)?;
+ let target_commit = repo
534
+ .find_reference(default_target.branch.to_string().as_str())?
535
+ .peel_to_commit()?;
536
+ let merge_base = repo.merge_base(head_commit.id(), target_commit.id())?;
537
repo.log(head_commit.id(), LogUntil::Commit(merge_base), false)?
538
.into_iter()
539
.rev()
0 commit comments