Fix jgit rev-list --objects master

This flag was not being honored due to a bug in createWalk().
argWalk is always non-null when there are commits passed in
on the command line. If --objects was specified, always make
a new ObjectWalk for the actual execution.

Change-Id: I6e1a1636f2634605d86671a83766cc1c42939821
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2011-08-08 08:31:30 -07:00
parent 86ecf141b6
commit 489604aaad
1 changed files with 5 additions and 3 deletions

View File

@ -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 {