diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-04-09 16:14:28 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2014-04-09 16:14:28 -0400 |
| commit | 6654baddae0e503531c208084c43ceb380bd402a (patch) | |
| tree | 0f414f4c068e907c41e1b7ead08a3cd22047db8f /org.eclipse.jgit | |
| parent | 4a11b7137fa7a3880fb05745256940c186589464 (diff) | |
| parent | 0f8a18cfca7fc69e6467eee2844c25d849e7d2a2 (diff) | |
| download | jgit-6654baddae0e503531c208084c43ceb380bd402a.tar.gz jgit-6654baddae0e503531c208084c43ceb380bd402a.zip | |
Merge changes Id9a641dd,If2ee1f42
* changes:
Added TestCase for 7d5e1f Fixed RevWalk.isMergedInto()
Fixed RevWalk.isMergedInto() returning wrong results
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java index e920353592..b3c4cced74 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -1,6 +1,7 @@ /* * Copyright (C) 2007, Robin Rosenberg <robin.rosenberg@dewire.com> * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> + * Copyright (C) 2014, Gustaf Lundh <gustaf.lundh@sonymobile.com> * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -388,7 +389,11 @@ public class RevWalk implements Iterable<RevCommit> { treeFilter = TreeFilter.ALL; markStart(tip); markStart(base); - return next() == base; + RevCommit mergeBase; + while ((mergeBase = next()) != null) + if (mergeBase == base) + return true; + return false; } finally { filter = oldRF; treeFilter = oldTF; |