From ed9f81b4a978db0fa618bb0cb7bfbea9288b8c66 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 18 Feb 2011 17:11:45 +0300 Subject: [PATCH] IDEA-65218 Correct background fetch Update information that current branch should be updated, after background fetch completes. --- .../src/git4idea/checkin/GitPushActiveBranchesDialog.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java index 371724c63a4c..a6c573d3ea83 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java +++ b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java @@ -528,14 +528,12 @@ public class GitPushActiveBranchesDialog extends DialogWrapper { * the difference is that commit checkboxes should be checked only during the initial refresh - others should respect * user who could uncheck some commits. */ - private void refreshTree(final boolean fetchData, final Map> unchecked, final boolean updateTree) { + private void refreshTree(final boolean fetchData, final Map> unchecked, final boolean updateUncheckedCommits) { myCommitTree.setPaintBusy(true); loadRootsInBackground(fetchData, new PushActiveBranchRunnable(){ @Override void run(List roots) { - if (updateTree) { - updateTree(roots, unchecked); - } + updateTree(roots, updateUncheckedCommits ? unchecked : null); updateUI(); myCommitTree.setPaintBusy(false); }