diff options
| author | Kevin Sawicki | 2011-05-04 13:50:26 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2011-05-04 13:50:26 +0000 |
| commit | a3f392189f80cb170cc0b537f216d5a0e3a1ac5b (patch) | |
| tree | 554be00f3a813292393b5f5092ffc137906b2370 | |
| parent | 2820bcfbfc246d0c78dad9f478bae81f18801bb2 (diff) | |
| download | egit-a3f392189f80cb170cc0b537f216d5a0e3a1ac5b.tar.gz egit-a3f392189f80cb170cc0b537f216d5a0e3a1ac5b.tar.xz egit-a3f392189f80cb170cc0b537f216d5a0e3a1ac5b.zip | |
Only update pull strategy when source branch changes.
Previously the pull strategy was set to the default
when the target branch text field was modified. This
would clear the user's selection if it was different
from the default.
Bug: 342168
Change-Id: I1126c58f631203b4cf3da4ce3a70681792cd57d7
Signed-off-by: Kevin Sawicki <kevin@github.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java index d1f23b347c..abe820fe0e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java @@ -182,6 +182,8 @@ class CreateBranchPage extends WizardPage { this.branchCombo.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { + upstreamConfig = getDefaultUpstreamConfig(myRepository, + branchCombo.getText()); checkPage(); } }); @@ -328,8 +330,7 @@ class CreateBranchPage extends WizardPage { buttonConfigMerge.setSelection(false); buttonConfigRebase.setSelection(false); buttonConfigNone.setSelection(false); - switch (getDefaultUpstreamConfig(myRepository, branchCombo - .getText())) { + switch (upstreamConfig) { case MERGE: buttonConfigMerge.setSelection(true); break; |