Update pullop tests and doc to reflect status change

ajoberstar · May 8, 2016 · 778f27f · 778f27f
1 parent ac8e2af
commit 778f27f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/groovy/org/ajoberstar/grgit/operation/PullOp.groovy b/src/main/groovy/org/ajoberstar/grgit/operation/PullOp.groovy
@@ -27,8 +27,8 @@ import org.eclipse.jgit.api.errors.GitAPIException
 
 /**
  * Pulls changes from the remote on the current branch. If the changes
- * conflict, the pull will fail, leaving the working tree as-is, and
- * throwing an exception.
+ * conflict, the pull will fail, any conflicts can be retrieved with
+ * {@code grgit.status()}, and throwing an exception.
  *
  * <p>Pull changes.</p>
  *

diff --git a/src/test/groovy/org/ajoberstar/grgit/operation/PullOpSpec.groovy b/src/test/groovy/org/ajoberstar/grgit/operation/PullOpSpec.groovy
@@ -17,6 +17,7 @@ package org.ajoberstar.grgit.operation
 
 import org.ajoberstar.grgit.Commit
 import org.ajoberstar.grgit.Grgit
+import org.ajoberstar.grgit.Status
 import org.ajoberstar.grgit.exception.GrgitException
 import org.ajoberstar.grgit.fixtures.MultiGitOpSpec
 
@@ -103,7 +104,7 @@ class PullOpSpec extends MultiGitOpSpec {
 		when:
 		localGrgit.pull()
 		then:
-		localGrgit.status().clean
+		localGrgit.status() == new Status(conflicts: ['1.txt'])
 		localGrgit.head() == localHead
 		thrown(GrgitException)
 	}