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

Unable to reset while stopped on Edit in interactive rebase #58

Open
gvl2023 opened this issue Oct 3, 2024 · 0 comments
Open

Unable to reset while stopped on Edit in interactive rebase #58

gvl2023 opened this issue Oct 3, 2024 · 0 comments
Labels
bug Something isn't working

Comments

@gvl2023
Copy link

gvl2023 commented Oct 3, 2024

Version

6.10.0.202406032230-r

Operating System

Linux/Unix

Eclipse version

2020-06

Bug description

Use case: User needs to be able to modify a previous commit using interactive rebase, add new changed files to the commit change set, add additional changes to the files already present in the commit change set, or split one commit into multiple commits, etc.

To support this use case one should be able to issue command git reset HEAD~ while stopped on Edit in interactive rebase to un-stage commit's changes.

Actual behavior

An attempt to bring up the reset dialog (Team/Reset...) while stopped on "Edit" in interactive rebase results in an error message:

Cannot reset HEAD now
Repository state: Interactive rebase

A secondary issue is that once reset is done outside of Eclipse the Git Staging view becomes confused, it initially shows correct Unstaged Changes but an attempt to stage them sometimes does nothing and the UI state gets out of sync with the actual git state as reported by git status.

Expected behavior

It should be possible to issue a reset command when stopped on Edit during interactive rebase within the IDE and the staging view should be in sync with the actual git state if reset is performed externally.

Relevant log output

No response

Other information

No response

@gvl2023 gvl2023 added the bug Something isn't working label Oct 3, 2024
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

1 participant