Skip to content

Fix copiedFromRemoteId bug #4807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2024
Merged

Fix copiedFromRemoteId bug #4807

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions apps/desktop/src/lib/vbranches/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonderful, less really is more!

I also tried my use-case again, which is to create a vbranch from another branch that has no change-ids in commits, and then undid one commit, and it also just works.

Screenshot 2024-09-01 at 18 57 19

I think what I wanted to accomplish is to have it show as Local and remote just as if change-ids were equal (or it's the same actual commit), but probably I misunderstood the state (or status) that such a copied commit is actually in.

And somewhat magically, it is all working even when the commit message is amended to the local commit.

return 'localAndRemote';
return 'local';
}
Expand Down