| commit | 52af2d197bd46778a44ef63f8cfe6c794b209817 | [log] [tgz] |
|---|---|---|
| author | aleon <alvsan09@gmail.com> | Wed Oct 19 18:28:45 2011 -0400 |
| committer | aleon <alvsan09@gmail.com> | Wed Oct 19 18:28:45 2011 -0400 |
| tree | 21eac52c3f139ab02c928ad0d3f54c23f636ecc6 | |
| parent | 5c9822093051a8797b28dd5d02550443e8403066 [diff] |
NEW - bug 358600: R4E Git connector search on LINUX generated exceptions Merge commits have more than one parent, the walk three was provisioned with all the parents, however egit/jgit throw an exception as it expects two trees only. https://bugs.eclipse.org/bugs/show_bug.cgi?id=358600
diff --git a/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/GitConnector.java b/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/GitConnector.java index e00e145..72f55b9 100644 --- a/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/GitConnector.java +++ b/org.eclipse.mylyn.git.core/src/org/eclipse/mylyn/internal/git/core/GitConnector.java
@@ -115,6 +115,8 @@ walk.parseHeaders(p); walk.parseBody(p); treeWalk.addTree(p.getTree()); + //we can compare with one parent only + break; } treeWalk.addTree(commit.getTree()); treeWalk.setRecursive(true);