summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorManuel Doninger2011-01-18 04:28:53 (EST)
committer Chris Aniszczyk2011-01-18 04:44:10 (EST)
commitf88cf91ca8d84d9708f79e2c8c963c0235deba56 (patch)
treefe6daa1b9b6e47ecc6a71199d0d7b8e1fcc768be
parentff9d34c2e4ac9d445cd1fd9b0bebf2719446a818 (diff)
downloadegit-f88cf91ca8d84d9708f79e2c8c963c0235deba56.zip
egit-f88cf91ca8d84d9708f79e2c8c963c0235deba56.tar.gz
egit-f88cf91ca8d84d9708f79e2c8c963c0235deba56.tar.bz2
Fixed bug with empty commitMessage and Mylynrefs/changes/67/2267/2
commitMessage was initialized with an empty string, so the method calculateCommitMessage always returned that empty string, even if a task is active Change-Id: Ia845c67cf2b7cad7775044c5f6049b61b369755f Signed-off-by: Manuel Doninger <manuel.doninger@googlemail.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
index 2e6ddd7..6d108d5 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
@@ -449,10 +449,6 @@ public class CommitDialog extends Dialog {
* @return the calculated commit message
*/
private String calculateCommitMessage() {
- if(commitMessage != null) {
- // special case for ament or merge
- return commitMessage;
- }
String calculatedCommitMessage = null;
Set<IResource> resources = new HashSet<IResource>();