Bug 547753 - Missing Abandon Commit
Summary: Missing Abandon Commit
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 10
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-05-29 03:45 EDT by Ed Willink CLA
Modified: 2019-05-30 04:53 EDT (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Ed Willink CLA 2019-05-29 03:45:23 EDT 
5.3.0. After a cherry pick that fails, the interactive merge fixup phase starts. Good.

If the result of that merge is that nothing is left to stage, there used to be an "Abandon Commit" or "Skip Commit" button in the Staging View. This has now vanished forcing a "Commit" which fails with "There are no staged files".

It seems to require two "Reset Hard"s gets out of the "Merged", but perhaps this is just a refresh failure of the Git REpo [branch - merged] decoration.

Please put the "Abandon Commit"/"Skip Commit" button back again.
Comment 1 Ed Willink CLA 2019-05-30 04:53:21 EDT 
Problem is more general. Once the interactive merge phase has started, there isno Abandon to allow a reversion of the partial cherry pick.