Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Kempin2010-12-08 14:56:58 +0000
committerEdwin Kempin2010-12-09 09:09:13 +0000
commit18f5e6f8dc828dc883764a151995b2c26c8d1802 (patch)
tree56aa31950e0a5904b304b43720ceff3b6b957ad9
parent526569fa0dad9f43cc17e33eaee3c58ab1917648 (diff)
downloadegit-18f5e6f8dc828dc883764a151995b2c26c8d1802.tar.gz
egit-18f5e6f8dc828dc883764a151995b2c26c8d1802.tar.xz
egit-18f5e6f8dc828dc883764a151995b2c26c8d1802.zip
Commit Dialog: reset author if amend is deselected
If in the commit dialag the amend option is selected the author field is automatically updated to the author of the previous commit. However if the amend option got deselected again the author of the previous commit stayed in the author field. With this change the author field is now reset to the original value if the amend option is deselected. Signed-off-by: Edwin Kempin <edwin.kempin@gmail.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java3
1 files changed, 2 insertions, 1 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 01a762e15a..f7925fb7fa 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
@@ -277,6 +277,7 @@ public class CommitDialog extends Dialog {
public void widgetSelected(SelectionEvent arg0) {
if (!amendingButton.getSelection()) {
originalChangeId = null;
+ authorText.setText(author);
}
else {
saveOriginalChangeId();
@@ -288,8 +289,8 @@ public class CommitDialog extends Dialog {
commitText.setText(curText
+ previousCommitMessage.replaceAll(
"\n", Text.DELIMITER)); //$NON-NLS-1$
- authorText.setText(previousAuthor);
}
+ authorText.setText(previousAuthor);
}
refreshChangeIdText();
}

Back to the top