From b54d2099e7bb09563263c556f814fee7d42e83c6 Mon Sep 17 00:00:00 2001
From: Irina Chernushina <Irina.Chernushina@jetbrains.com>
Date: Wed, 23 Sep 2009 18:30:25 +0400
Subject: [PATCH] Git: get merge base small correction

---
 plugins/git4idea/src/git4idea/GitBranch.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git4idea/src/git4idea/GitBranch.java b/plugins/git4idea/src/git4idea/GitBranch.java
index 671ed1eaff1c..2069e0856e84 100644
--- a/plugins/git4idea/src/git4idea/GitBranch.java
+++ b/plugins/git4idea/src/git4idea/GitBranch.java
@@ -301,6 +301,8 @@ public class GitBranch extends GitReference {
   public GitRevisionNumber getMergeBase(@NotNull Project project, @NotNull VirtualFile root, @NotNull GitBranch branch)
     throws VcsException {
     GitSimpleHandler h = new GitSimpleHandler(project, root, GitHandler.MERGE_BASE);
+    h.setNoSSH(true);
+    h.setSilent(true);
     h.addParameters(this.getFullName(), branch.getFullName());
     String output = h.run().trim();
     if (output.length() == 0) {