# [JGIT PATCH] Clarify that TreeWalk trees must all have the same root 1 messages from 2009-02-04 to 2009-02-04. Participants: Tor Arne Vestbø. Thread: https://gitlist.dev/t/17559 ## Tor Arne Vestbø, 2009-02-04 15:48 Subject: [JGIT PATCH] Clarify that TreeWalk trees must all have the same root Message-ID: <1233762485-1520-1-git-send-email-torarnv@gmail.com> URL: https://gitlist.dev/e/1233762485-1520-1-git-send-email-torarnv%40gmail.com ``` Signed-off-by: Tor Arne Vestbø --- .../src/org/spearce/jgit/treewalk/TreeWalk.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/treewalk/TreeWalk.java b/org.spearce.jgit/src/org/spearce/jgit/treewalk/TreeWalk.java index cbecb05..189fc86 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/treewalk/TreeWalk.java +++ b/org.spearce.jgit/src/org/spearce/jgit/treewalk/TreeWalk.java @@ -61,6 +61,8 @@ *

* This class can perform n-way differences across as many trees as necessary. *

+ * Each tree added must have the same root as existing trees in the walk. + *

* A TreeWalk instance can only be used once to generate results. Running a * second time requires creating a new TreeWalk instance, or invoking * {@link #reset()} and adding new trees before starting again. Resetting an @@ -87,7 +89,7 @@ * @param path * single path to advance the tree walk instance into. * @param trees - * one or more trees to walk through. + * one or more trees to walk through, all with the same root. * @return a new tree walk configured for exactly this one path; null if no * path was found in any of the trees. * @throws IOException @@ -377,6 +379,8 @@ public void reset(final AnyObjectId[] ids) throws MissingObjectException, *

* The position of this tree is returned to the caller, in case the caller * has lost track of the order they added the trees into the walker. + *

+ * The tree must have the same root as existing trees in the walk. * * @param id * identity of the tree object the caller wants walked. @@ -403,10 +407,16 @@ public int addTree(final ObjectId id) throws MissingObjectException, *

* The position of this tree is returned to the caller, in case the caller * has lost track of the order they added the trees into the walker. + *

+ * The tree which the iterator operates on must have the same root as + * existing trees in the walk. * * @param p * an iterator to walk over. The iterator should be new, with no * parent, and should still be positioned before the first entry. + * The tree which the iterator operates on must have the same root + * as other trees in the walk. + * * @return position of this tree within the walker. * @throws CorruptObjectException * the iterator was unable to obtain its first entry, due to -- 1.6.1.2.309.g2ea3 ```