Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2015-04-26 20:26:51 +0000
committerGerrit Code Review @ Eclipse.org2015-04-26 20:26:54 +0000
commitf02e4a61887d89bf97dffa8e626735c3675cabe3 (patch)
treeca63c08958d9fa008b4bf4e56f6d11d11f47d18f
parent9b486e390625df6cb495f57012a0384753399ec8 (diff)
parentd1da2780c2488151c7a5d44e08e6bf459e65338d (diff)
downloadjgit-f02e4a61887d89bf97dffa8e626735c3675cabe3.tar.gz
jgit-f02e4a61887d89bf97dffa8e626735c3675cabe3.tar.xz
jgit-f02e4a61887d89bf97dffa8e626735c3675cabe3.zip
Merge "Revert "Let ObjectWalk.markUninteresting also mark the root tree as"" into stable-3.7
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java15
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java14
2 files changed, 1 insertions, 28 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
index 9cbb1c8752..dfde7fcf2c 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
@@ -215,21 +215,6 @@ public class ObjectWalkTest extends RevWalkTestCase {
}
@Test
- public void testMarkUninterestingPropagation() throws Exception {
- final RevBlob f = blob("1");
- final RevTree t = tree(file("f", f));
- final RevCommit c1 = commit(t);
- final RevCommit c2 = commit(t);
-
- markUninteresting(c1);
- markStart(c2);
-
- assertSame(c2, objw.next());
- assertNull(objw.next());
- assertNull(objw.nextObject());
- }
-
- @Test
public void testEmptyTreeCorruption() throws Exception {
ObjectId bId = ObjectId
.fromString("abbbfafe3129f85747aba7bfac992af77134c607");
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
index b73ccb1974..a0af067dc0 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
@@ -232,7 +232,7 @@ public class ObjectWalk extends RevWalk {
}
if (o instanceof RevCommit)
- markUninteresting((RevCommit) o);
+ super.markUninteresting((RevCommit) o);
else if (o instanceof RevTree)
markTreeUninteresting((RevTree) o);
else
@@ -242,18 +242,6 @@ public class ObjectWalk extends RevWalk {
addObject(o);
}
- @Override
- public void markUninteresting(RevCommit c) throws MissingObjectException,
- IncorrectObjectTypeException, IOException {
- super.markUninteresting(c);
- try {
- markTreeUninteresting(c.getTree());
- } catch (MissingObjectException e) {
- // we don't care if the tree of the commit does not exist locally
- }
- }
-
- @Override
public void sort(RevSort s) {
super.sort(s);
boundary = hasRevSort(RevSort.BOUNDARY);

Back to the top