]> source.dussan.org Git - jgit.git/commit
Let ObjectWalk.markUninteresting also mark the root tree as 81/31081/5
authorSaša Živkov <sasa.zivkov@sap.com>
Tue, 5 Aug 2014 13:14:59 +0000 (15:14 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 28 Aug 2014 22:05:59 +0000 (18:05 -0400)
commitc4797fe98655b3d52d0a90ba44fce6e053db3b8b
tree8120a0caadc4204d6a28e9ab31afa5d3916b39c5
parent684a2a058ab5454f687af316a6ec562b5538589a
Let ObjectWalk.markUninteresting also mark the root tree as
uninteresting

Using the ObjectWalk and marking a commit as uninteresting didn't mark
its root tree as uninteresting. This caused the "missing tree ..."
error in Gerrit under special circumstances. For example, if the
patch-set 2 changes only the commit message then the patch-set 1
and patch-set 2 share the same root-tree:

  ps1 -> o   o <- ps2
          \ /
           o root-tree

The transported pack will contain the ps2 commit but not the root-tree
object.

When using the BaseReceivePack.setCheckReferencedObjectsAreReachable
JGit will check the reachability of all referenced objects not provided
in the transported pack. Since the ps1 was advertised it will properly
be marked as uninteresting. However, the root-tree was reachable because
the ObjectWalk.markUninteresting missed to mark it as uninteresting.
JGit was then rejecting the pack with the "missing tree ..." exception.

Gerrit-issue: https://code.google.com/p/gerrit/issues/detail?id=1582
Change-Id: Iff2de8810f14ca304e6655fc8debeb8f3e20712b
Signed-off-by: Saša Živkov <sasa.zivkov@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/ObjectWalkTest.java
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java