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

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

Browse Source 
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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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