Upgrade JGit to fix #30 and #48.

ajoberstar · Jan 29, 2015 · 3ea2320 · 3ea2320
1 parent f9fc860
commit 3ea2320
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,8 @@ repositories {
 	mavenCentral()
 }
 
-def jgitVersion = '3.3.2.201404171909-r'
+def jgitVersion = '3.6.2.201501210735-r'
+// def jgitVersion = '3.3.2.201404171909-r' // pre-bug
 // def jgitVersion = '3.4.1.201406201815-r' // behavior of log command is different
 
 dependencies {

diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/PullOpSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/operation/PullOpSpec.groovy
@@ -72,10 +72,15 @@ class PullOpSpec extends MultiGitOpSpec {
 		localGrgit.pull()
 		then:
 		// includes all commits from remote
-		localGrgit.log {
-			includes = [remoteHead.id]
-			excludes = ['HEAD']
-		}.size() == 0
+		(remoteGrgit.log(includes: ['master']) - localGrgit.log()).size() == 0
+		/*
+		 * Go back to one pass log command when bug is fixed:
+		 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=439675
+		 */
+		// localGrgit.log {
+		// 	includes = [remoteHead.id]
+		// 	excludes = ['HEAD']
+		// }.size() == 0
 
 		// has merge commit
 		localGrgit.log {