Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 380
    • Issues 380
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #3228
Closed
Open
Issue created Jul 02, 2018 by Sebastian Zartner@SebastianZ1

Rebase cancelled after empty commit

What steps will reproduce the problem?

  1. Open the rebase dialog and select two branches
  2. Set a commit between them to 'Edit'
  3. Start the rebase
  4. When the rebase reached the commit, edit the files so that there isn't any change anymore
  5. Continue the rebase => A dialog is shown saying that there are no changes to commit and asking what should be done. Options are 'Skip', 'Abort', and 'Cancel'
  6. Choose 'Cancel'

Note that my rebase was quite complex and I didn't have the chance to check whether that are the exact steps.

What is the expected output? What do you see instead?

I clicked 'Cancel' thinking I could then check the changes again, maybe amend other changes, then commit and continue rebasing, or just skip the commit afterwards. Though the rebase was cancelled with the message "An unrecoverable error occurred." and the only available option after that was 'Abort'. See this screenshot:

Cancelled rebase

What version of TortoiseGit and Git are you using? On what operating system?

  • TortoiseGit: 2.6.0.0
  • git: 2.18.0.windows.1

Please provide any additional information below.

I assume if I clicked 'Skip', the rebase would have continued. After presenting a modal dialog asking for a user action, it should be possible to close it and check the commit and continue the rebase.

Edited Jul 03, 2018 by Sebastian Zartner
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking