From 0f70237a11242abfabb7856dfd45872248022ec3 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
Date: Sun, 9 Jun 2019 11:17:44 +0100
Subject: [PATCH] git: get the list of branches from Git under a modal progress
 instead of the EDT: IDEA-215869

GitOrigin-RevId: 42c271bf6b303b0d9089e8945fa22500a7651df6
---
 plugins/git4idea/src/git4idea/merge/GitMergeDialog.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java
index e4731bd8a98f..974fd93de7fa 100644
--- a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java
@@ -2,6 +2,7 @@
 package git4idea.merge;
 
 import com.intellij.ide.util.ElementsChooser;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vcs.VcsException;
@@ -137,7 +138,9 @@ public class GitMergeDialog extends DialogWrapper {
     VirtualFile root = getSelectedRoot();
     GitLineHandler handler = new GitLineHandler(myProject, root, GitCommand.BRANCH);
     handler.addParameters("--no-color", "-a", "--no-merged");
-    String output = Git.getInstance().runCommand(handler).getOutputOrThrow();
+    String output = ProgressManager.getInstance().runProcessWithProgressSynchronously(
+      () -> Git.getInstance().runCommand(handler).getOutputOrThrow(),
+      "Preparing List of Branches", true, myProject);
     myBranchChooser.clear();
     for (StringTokenizer lines = new StringTokenizer(output, "\n", false); lines.hasMoreTokens();) {
       String branch = lines.nextToken().substring(2);