Merge "Revert "Let ObjectWalk.markUninteresting also mark the root tree as"" into stable-3.7
This commit is contained in:
commit
f02e4a6188
|
@ -214,21 +214,6 @@ public void testCull() throws Exception {
|
||||||
assertNull(objw.nextObject());
|
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
|
@Test
|
||||||
public void testEmptyTreeCorruption() throws Exception {
|
public void testEmptyTreeCorruption() throws Exception {
|
||||||
ObjectId bId = ObjectId
|
ObjectId bId = ObjectId
|
||||||
|
|
|
@ -232,7 +232,7 @@ public void markUninteresting(RevObject o) throws MissingObjectException,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (o instanceof RevCommit)
|
if (o instanceof RevCommit)
|
||||||
markUninteresting((RevCommit) o);
|
super.markUninteresting((RevCommit) o);
|
||||||
else if (o instanceof RevTree)
|
else if (o instanceof RevTree)
|
||||||
markTreeUninteresting((RevTree) o);
|
markTreeUninteresting((RevTree) o);
|
||||||
else
|
else
|
||||||
|
@ -242,18 +242,6 @@ else if (o instanceof RevTree)
|
||||||
addObject(o);
|
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) {
|
public void sort(RevSort s) {
|
||||||
super.sort(s);
|
super.sort(s);
|
||||||
boundary = hasRevSort(RevSort.BOUNDARY);
|
boundary = hasRevSort(RevSort.BOUNDARY);
|
||||||
|
|
Loading…
Reference in New Issue