Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 353816

Summary:	Amend in commit dialog only shows changed files since HEAD
Product:	[Technology] EGit	Reporter:	Robin Rosenberg <robin.rosenberg>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	NEW ---	QA Contact:
Severity:	normal
Priority:	P3	CC:	christian.halstrick, rillig, t-oberlies
Version:	1.1
Target Milestone:	---
Hardware:	PC
OS:	Mac OS X - Carbon (unsup.)
See Also:	https://bugs.eclipse.org/bugs/show_bug.cgi?id=532516
Whiteboard:
Bug Depends on:	490126
Bug Blocks:

Description Robin Rosenberg

2011-08-03 15:20:00 EDT

It should (be able to) show changes since the parent of HEAD (HEAD^).

An example is when I included a change that I did not want, so I'd like
to use amend to remove it.

Comment 1 Roland Illig

2015-02-06 06:16:14 EST

*** Bug 459152 has been marked as a duplicate of this bug. ***

Comment 2 Roland Illig

2015-02-06 06:30:54 EST

Summarized feature requests from bug 459152:

In the Git Staging view, when editing an existing commit, it should be possible to re-edit all details of a commit. This includes not only the commit message, but also all file additions, modifications and deletions. Therefore, the Staged Changes file list should list the changes that happen in the commit that is being edited. (Currently it is empty.)

The menu item “Modify > Edit” should not switch to the Git Interactive Rebase view but instead to the Git Staging view, since that is the natural view to change details for a single commit. The fact that interactive rebase is used to implement this command should not dominate the UI.

Comment 3 Christian Halstrick

2015-02-09 03:32:14 EST

Which menu item "Modify > Edit"? I guess you mean when starting from "History View" and select there "Modify > Edit" there, or?

If that is the case and if I select a commit in History view which is not HEAD then I find it ok to popup the rebase view. It should be clear that modifying a single commit which is not HEAD requires that all the successor commits of that commit also have to be changed.

I agree that if you select HEAD in History view and say "Modify > Edit" then we should come up with staging view.

Comment 4 Roland Illig

2015-02-09 04:16:06 EST

(In reply to Christian Halstrick from comment #3)
> Which menu item "Modify > Edit"? I guess you mean when starting from
> "History View" and select there "Modify > Edit" there, or?

Yes, I meant this.

> If that is the case and if I select a commit in History view which is not
> HEAD then I find it ok to popup the rebase view. It should be clear that
> modifying a single commit which is not HEAD requires that all the successor
> commits of that commit also have to be changed.

Yes, that would indeed be good.