mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-25 02:26:14 +03:00
Merge pull request #5173 from gitbutlerapp/fix-issues-with-series-listing
Stack - correctly flag remote commits when no changeid
This commit is contained in:
commit
5cd9d77fec
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user