Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Hein2016-09-16 19:53:01 +0000
committerMatthias Sohn2016-09-18 22:00:11 +0000
commit505d0b315f9bcc390c5c0025369f94766059e22f (patch)
tree0f2df428e808d1690c89e919c43d8a60d63437bf
parent630a0f003e27c772d68f2b7909554e8b52a8201f (diff)
downloadegit-505d0b315f9bcc390c5c0025369f94766059e22f.tar.gz
egit-505d0b315f9bcc390c5c0025369f94766059e22f.tar.xz
egit-505d0b315f9bcc390c5c0025369f94766059e22f.zip
Update staging view when preparing no-ff-merge commit
With commit b0a0b002 the condition for updating the staging view changed. After that the generated default merge message was not shown when preparing a no-ff-merge commit. This is fixed with this commit. Bug: 499697 Change-Id: Ide640c9eec2e9a8ed213d7a3f3296f741cba77cc Signed-off-by: Tobias Hein <th.mailinglists@googlemail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
index 5514d573b..b92e29c51 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java
@@ -11,6 +11,7 @@
* Contributors:
* Tobias Baumann <tobbaumann@gmail.com> - Bug 373969, 473544
* Thomas Wolf <thomas.wolf@paranor.ch>
+ * Tobias Hein <th.mailinglists@googlemail.com> - Bug 499697
*******************************************************************************/
package org.eclipse.egit.ui.internal.staging;
@@ -3626,7 +3627,8 @@ public class StagingView extends ViewPart implements IShowInSource {
loadExistingState(helper, oldState);
} else { // repository did not change
if (!commitMessageComponent.getHeadCommit().equals(
- helper.getPreviousCommit())) {
+ helper.getPreviousCommit())
+ || !commitMessageComponent.isAmending()) {
if (!commitMessageComponent.isAmending()
&& userEnteredCommitMessage())
addHeadChangedWarning(commitMessageComponent

Back to the top