From: Marek Zawirski Date: Fri, 27 Jun 2008 22:06:36 GMT Subject: [EGIT PATCH 12/23] Fix: let RevWalk reset correctly before isMergedInto() Message-ID: <1214604407-30572-13-git-send-email-marek.zawirski@gmail.com> In-Reply-To: <1214604407-30572-12-git-send-email-marek.zawirski@gmail.com> Retained flags was wrongly computed for reset() call inside isMergedInto(). Signed-off-by: Marek Zawirski --- .../src/org/spearce/jgit/revwalk/RevWalk.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/revwalk/RevWalk.java b/org.spearce.jgit/src/org/spearce/jgit/revwalk/RevWalk.java index fc757a5..7976d75 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/revwalk/RevWalk.java +++ b/org.spearce.jgit/src/org/spearce/jgit/revwalk/RevWalk.java @@ -347,7 +347,7 @@ public class RevWalk implements Iterable { final TreeFilter oldTF = treeFilter; try { finishDelayedFreeFlags(); - reset(~freeFlags & ~RESERVED_FLAGS); + reset(~freeFlags & APP_FLAGS); filter = RevFilter.MERGE_BASE; treeFilter = TreeFilter.ALL; markStart(tip); -- 1.5.5.3