| commit | f7cd2958334cc2ce671e5512754ee867ca483304 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 16 Sep 2008 19:34:36 +0000 (16 12:34 -0700) | ||
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Tue, 16 Sep 2008 22:48:47 +0000 (17 00:48 +0200) | ||
| tree | 1b764771b032f76505c9e099a74003cca7f309b3 | treesnapshot (tar.gz zip) |
| parent | 6706c8601103c5a719dfd3a96f2f9087e5b358a1 | commitdiff |
Paper bag fix RevWalk.reset after inMergeBase is used
We need to remove delayedFreeFlags from carryFlags anytime we
mark those delayedFreeFlags as actually freeFlags. In other
words we do not want to continue carrying a flag which we have
now freed and will recycle for a different use in the future,
one which may not want to be carried automatically onto parent
commits during revision traversal.
I had the boolean expression incorrect (call it a typo). The
correct way to remove set b from a is "a &= ~b" not "a &= b".
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
We need to remove delayedFreeFlags from carryFlags anytime we
mark those delayedFreeFlags as actually freeFlags. In other
words we do not want to continue carrying a flag which we have
now freed and will recycle for a different use in the future,
one which may not want to be carried automatically onto parent
commits during revision traversal.
I had the boolean expression incorrect (call it a typo). The
correct way to remove set b from a is "a &= ~b" not "a &= b".
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
| org.spearce.jgit/src/org/spearce/jgit/revwalk/RevWalk.java | diffblobblamehistory |