mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-18 14:31:30 +03:00
Merge pull request #5191 from gitbutlerapp/fix-stack-upstream-commit-listing
Stack: fix upstream commit listing
This commit is contained in:
commit
a4693c1fee
@ -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() {
|
||||||
|
Loading…
Reference in New Issue
Block a user