Fix FileTreeIterator.idSubmodule(Entry)

FileTreeIterator was calling by mistake
WorkingTreeIterator.idSubmodule(Entry). Instead it should always compute
idSubmodule on its own.

Change-Id: Id1b988aded06939b1d7edd2671e34bf756896c0e

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffSubmoduleTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffSubmoduleTest.java
index 863d79ddee5ea9789c87ffb62f38a4175e6133b0..3259f622f37bbd13b4edd24b30efe7d11cd89897 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffSubmoduleTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffSubmoduleTest.java
@@ -87,7 +87,7 @@ public class IndexDiffSubmoduleTest extends RepositoryTestCase {
                                .call();
 
                submodule_db = (FileRepository) Git.wrap(db).submoduleAdd()
-                               .setPath("submodule")
+                               .setPath("modules/submodule")
                                .setURI(submoduleStandalone.getDirectory().toURI().toString())
                                .call();
                submoduleStandalone.close();

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java
index 8d2cb1d8cdc6ce16feb13bc91cff00b87dfea859..accf4956f64bfa9cb1e2ab446cff4aea61c82486 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java
@@ -67,8 +67,8 @@ import org.eclipse.jgit.util.FS;
  */
 public class FileTreeIterator extends WorkingTreeIterator {
        /**
-        * the starting directory. This directory should correspond to the root of
-        * the repository.
+        * the starting directory of this Iterator. All entries are located directly
+        * in this directory.
         */
        protected final File directory;
 
@@ -238,8 +238,6 @@ public class FileTreeIterator extends WorkingTreeIterator {
 
        @Override
        protected byte[] idSubmodule(final Entry e) {
-               if (repository == null)
-                       return idSubmodule(getDirectory(), e);
-               return super.idSubmodule(e);
+               return idSubmodule(getDirectory(), e);
        }
 }