From 69fb64e29a9a6add8d41bfc8c8b39cbdc2fa99d4 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Fri, 21 Jan 2022 17:51:05 +0300 Subject: [PATCH] IDEA-285766 Git branches popup duplicates branch GitOrigin-RevId: 750780c92a931a7aa7cad35114a4a5937a70be9d --- .../src/com/intellij/dvcs/branch/DvcsBranchPopup.java | 3 +-- .../src/com/intellij/dvcs/ui/BranchActionGroupPopup.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsBranchPopup.java b/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsBranchPopup.java index c11453edcbf0..49773fdd9eee 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsBranchPopup.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsBranchPopup.java @@ -55,8 +55,7 @@ public abstract class DvcsBranchPopup { myMultiRootBranchConfig = multiRootBranchConfig; myInSpecificRepository = myRepositoryManager.moreThanOneRoot() && myVcsSettings.getSyncSetting() == DvcsSyncSettings.Value.DONT_SYNC; String title = buildTitle(currentRepository); - myPopup = new BranchActionGroupPopup(title, myProject, preselectActionCondition, - ActionGroupUtil.forceRecursiveUpdateInBackground(createActions()), dimensionKey, dataContext); + myPopup = new BranchActionGroupPopup(title, myProject, preselectActionCondition, createActions(), dimensionKey, dataContext); initBranchSyncPolicyIfNotInitialized(); warnThatBranchesDivergedIfNeeded(); if (myRepositoryManager.moreThanOneRoot()) { diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java index 491ebe850018..f640def66f5d 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java @@ -68,7 +68,7 @@ public final class BranchActionGroupPopup extends FlatSpeedSearchPopup { @NotNull ActionGroup actions, @Nullable String dimensionKey, @NotNull DataContext dataContext) { - super(title, createBranchSpeedSearchActionGroup(actions), dataContext, preselectActionCondition, true); + super(title, ActionGroupUtil.forceRecursiveUpdateInBackground(createBranchSpeedSearchActionGroup(actions)), dataContext, preselectActionCondition, true); getTitle().setBackground(JBColor.PanelBackground); myProject = project; DataManager.registerDataProvider(getList(), dataId -> POPUP_MODEL.is(dataId) ? getListModel() : null);