Skip to content

Failed rebase is not detected properly #2629

@GoaLitiuM

Description

@GoaLitiuM

One of my repositories is permanently stuck in refreshing state (the spinning icon is constantly on top) after trying run rebase, and some of the functionality like being able to checkout another branch or real-time updates to changed files doesn't work. This persist after closing the application, and other repositories have no such issue. There is no indications that there is an ongoing rebase active, git status:

On branch master
Your branch is behind 'origin/master' by 140 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Last commands done (162 commands done):
   label branch-1
   reset branch-point-16 # Merge branch 'branch-2'
  (see more in file .git/rebase-merge/done)
Next commands to do (105 remaining commands):
   pick 1234abc56 Random commit
   label branch-point-17
  (use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch 'branch-to-be-rebased' on '789def012'.
  (use "git commit --amend" to amend the current commit)
  (use "git rebase --continue" once you are satisfied with your changes)

nothing to commit, working tree clean

The issue does get fixed by manually aborting the rebase, but shouldn't Fork detect this case?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions