Merge branch 'stable-3.7'
* stable-3.7: Prepare 3.7.2-SNAPSHOT builds JGit v3.7.1.201504261725-r Revert "Let ObjectWalk.markUninteresting also mark the root tree as" Change-Id: If1b62ff695e063d797c3d13c43e488ca56f29cbe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
65423ea1b1
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue