diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
index 474e974cd..715cb71b4 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java
@@ -199,9 +199,11 @@ else if (revLimiter.size() > 1)
 	}
 
 	protected RevWalk createWalk() {
-		if (argWalk == null)
-			argWalk = objects ? new ObjectWalk(db) : new RevWalk(db);
-		return argWalk;
+		if (objects)
+			return new ObjectWalk(db);
+		if (argWalk != null)
+			return argWalk;
+		return new RevWalk(db);
 	}
 
 	protected int walkLoop() throws Exception {