Merge pull request #5191 from gitbutlerapp/fix-stack-upstream-commit-listing

Stack: fix upstream commit listing
This commit is contained in:
Kiril Videlov 2024-10-17 18:57:20 +02:00 committed by GitHub
commit a4693c1fee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -509,7 +509,7 @@ impl StackExt for Stack {
// compute the commits that are only in the upstream // compute the commits that are only in the upstream
let local_patches_including_merge = repo let local_patches_including_merge = repo
.log(head_commit, LogUntil::Commit(previous_head), true)? .log(head_commit, LogUntil::Commit(merge_base), true)?
.iter() .iter()
.rev() // oldest commit first .rev() // oldest commit first
.map(|c| match c.change_id() { .map(|c| match c.change_id() {