motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Revert "Let ObjectWalk.markUninteresting also mark the root tree as"" into stable-3.7

This commit is contained in:
Matthias Sohn 2015-04-26 16:26:51 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 9b486e3906 d1da2780c2
commit f02e4a6188
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
View File

@ -214,21 +214,6 @@ public void testCull() throws Exception {
assertNull(objw.nextObject());
}
@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

14
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java
View File

@ -232,7 +232,7 @@ public void markUninteresting(RevObject o) throws MissingObjectException,
}
if (o instanceof RevCommit)
markUninteresting((RevCommit) o);
super.markUninteresting((RevCommit) o);
else if (o instanceof RevTree)
markTreeUninteresting((RevTree) o);
else
@ -242,18 +242,6 @@ else if (o instanceof RevTree)
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);