gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-25 10:33:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5173 from gitbutlerapp/fix-issues-with-series-listing

Browse Source 
Stack - correctly flag remote commits when no changeid
This commit is contained in:
Kiril Videlov 2024-10-16 17:34:30 +02:00 committed by GitHub
commit 5cd9d77fec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/gitbutler-branch-actions/src/virtual.rs
View File

@ -512,7 +512,12 @@ fn stack_series(
.get(&change_id)
.cloned()
})
.or(copied_from_remote_id);
.or(copied_from_remote_id)
.or(if series.remote(&patch) {
Some(commit.id())
} else {
None
});
if remote_commit_id.map_or(false, |id| commit.id() != id) {
requires_force = true;
}