Skip to content

Editing a commit with an interactive rebase is not properly handled #790

@AdrienMatricon

Description

@AdrienMatricon

Steps to reproduce:

  • Perform an interactive rebase
  • Choose Edit for a commit
  • Click on Start

What that does:

  • Good: It does perform an interactive rebase and stops at that commit so that the user can edit it
  • Good: There is a banner at the top saying that there is an ongoing rebase
  • Bad: The buttons in the banner are Resolve and Abort as if there was a conflict
    • There is no conflict to resolve, so the buttons should be Continue and Abort
    • I may be remembering this incorrectly but I think that this used to be handled properly until some weeks ago
  • Bad: In the Local Changes page, the Amend checkbox has disappeared, and the Commit and Commit & Push buttons are replaced by a Continue button and a menu with the option Commit (edit)
    • Editing is supposed to be like working on a branch, except that you cannot rebase because there is already a rebase going on. Some example of its uses: amending the edited commit, creating a new commit after the edited one, splitting the edited commit (and maybe also some before it) by resetting to an older commit then creating better commits with those changes. Then once you're done, you tell the rebase to continue so that it applies the later commits on top of the changes
    • For that reason, the page should be as usual, allowing the user to stage/commit/amend
    • That being said, removing the Commit & Push button does make sense because pushing during a rebase is an error (although you could keep it and let the user deal with the error message), and renaming the Commit button to Commit (edit) is not a bad idea

Metadata

Metadata

Assignees

Labels

enhancementNew feature or request

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions