Skip to content

fix: accurate rebase status detection and continuous status polling#262

Merged
AmethystLiang merged 1 commit intomainfrom
fix-rebase-status
Apr 3, 2026
Merged

fix: accurate rebase status detection and continuous status polling#262
AmethystLiang merged 1 commit intomainfrom
fix-rebase-status

Conversation

@AmethystLiang
Copy link
Copy Markdown
Contributor

Problem

During rebasing, the UI sometimes leaves stale 'Rebasing' badges behind because it relies on checking REBASE_HEAD which is only present during conflicting steps of a rebase, and can sometimes be left behind even after the rebase finishes. Additionally, when the right sidebar is unmounted, worktree git status stops polling, preventing worktree cards from updating their states correctly.

Solution

  1. Changed rebase detection to exclusively check for rebase-merge/ or rebase-apply/ directories, which exist for the entire duration of a rebase operation.
  2. Moved the useGitStatusPolling() hook from RightSidebar up to App.tsx so it can continue to poll in the background even when the sidebar is closed.

@AmethystLiang AmethystLiang merged commit 126ec8b into main Apr 3, 2026
1 check passed
@AmethystLiang AmethystLiang deleted the fix-rebase-status branch April 3, 2026 03:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant