MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Git: get merge base small correction

Browse Source
This commit is contained in:
Irina Chernushina
2009-09-23 18:30:25 +04:00
parent 5e8e93c6d1
commit b54d2099e7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/GitBranch.java
+2
View File
@@ -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) {