Skip to content
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.

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

Commit disappear when reordering commit #5527

Open
LovesAsuna opened this issue Nov 12, 2024 · 6 comments
Open

Commit disappear when reordering commit #5527

LovesAsuna opened this issue Nov 12, 2024 · 6 comments
Labels
bug Something isn't working

Comments

@LovesAsuna
Copy link

Version

0.13.13

Operating System

macOS

Distribution Method

dmg (Apple Silicon)

Describe the issue

When reordering commits(rebase), I will occasionally see commits disappear, unapply and reapply the branch and the commit will reappear.
But this phenomenon is not inevitable, but the probability of its occurrence is not low

How to reproduce

reordering commits

Expected behavior

disappear:
image
reappear:
image

Relevant log output

No response

@LovesAsuna LovesAsuna added the bug Something isn't working label Nov 12, 2024
@Byron
Copy link
Collaborator

Byron commented Nov 12, 2024

Thanks a lot for reporting!

It's hard for me to imagine how this is possible, as it seems to be flip-flopping between the states.

Next time, after a commit seems to be disappearing, could you hit Cmd + R to refresh the user interface? I'd like to find out if this is an issue with the UI state, or something 'persisting' related to the data produced by the backend.

Thanks a lot.

@Byron Byron added the feedback requested Feedback was requested to help resolve the issue label Nov 12, 2024
@LovesAsuna
Copy link
Author

@Byron I see this issue in the latest changelog, can you confirm if it has been fixed?

@Byron
Copy link
Collaborator

Byron commented Nov 14, 2024

Unfortunately it's hard for me to say if PRs aren't linking within this issue. I am also having trouble to bring up the changelog of the current version, or past versions for that matter.

Thus I'd hope you could watch out for the issue while using GitButler in the latest version, as chances are that it the issue might be fixed.
And if not, let's try to press Cmd + R to see if a UI refresh fixes it.

@Byron
Copy link
Collaborator

Byron commented Nov 14, 2024

Actually I realized that release-notes are now part of the respective GitHub release.

From there, I see…

Fixes a bug where when commits were reordered, the commit timestamps were not updated - because GitHub uses timestamps for commit ordering this was sometimes creating a confusing output

The question is if this issue is due to reordering of commits so they disappear, or if it is something else entirely. You can probably watch out for that as well - is the disappearing commit just somewhere else?

In any case, I'd hope that the issue is related to the release note.

@LovesAsuna
Copy link
Author

Unfortunately it's hard for me to say if PRs aren't linking within this issue. I am also having trouble to bring up the changelog of the current version, or past versions for that matter.

Thus I'd hope you could watch out for the issue while using GitButler in the latest version, as chances are that it the issue might be fixed. And if not, let's try to press Cmd + R to see if a UI refresh fixes it.

I've just had this happen again, and the ui refresh doesn't fix it, you need to reapply the branch to fix it!

@Byron Byron removed the feedback requested Feedback was requested to help resolve the issue label Nov 21, 2024
@Byron
Copy link
Collaborator

Byron commented Nov 21, 2024

Thank you, this helps! So it's some information that the backend produces that makes the UI either hide the commit, or it's not made available to begin with.
Since re-applying fixes the issue, it's probably not really lost, just 'not visible' or hidden due to some logic.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants