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

Fix copiedFromRemoteId bug

Browse Source 
- correctly shows commits as rebased when changeId is missing
- setting relatedTo is sufficient, no need to touch `get status()`
This commit is contained in:
Mattias Granlund 2024-09-01 12:35:53 +03:00
parent de310a203d
commit 98c3f5d310
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/desktop/src/lib/vbranches/types.ts
View File

@ -188,10 +188,7 @@ export class DetailedCommit {
get status(): CommitStatus {
if (this.isIntegrated) return 'integrated';
if (
(this.isRemote && (!this.relatedTo || this.id === this.relatedTo.id)) ||
(this.copiedFromRemoteId && this.relatedTo && this.copiedFromRemoteId === this.relatedTo.id)
)
if (this.isRemote && (!this.relatedTo || this.id === this.relatedTo.id))
return 'localAndRemote';
return 'local';
}