diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2015-06-09 09:31:26 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2015-06-11 00:11:27 +0200 |
| commit | 4531259613699688cadbfe6dcc577ccf8a90eb8d (patch) | |
| tree | 1d9db9bb981bfd10fc8e8891db49c27b6add2469 /org.eclipse.jgit.test | |
| parent | 2508f1695f38e450ed320bafdd6b94fedabf116d (diff) | |
| download | jgit-4531259613699688cadbfe6dcc577ccf8a90eb8d.tar.gz jgit-4531259613699688cadbfe6dcc577ccf8a90eb8d.zip | |
Add new submodule layout to SubmoduleAddCommand
The new submodule layout where GITDIR of a submodule is located at
<parent-repo-GITDIR>/modules/<submodule-path> was only used during
clone. Teach SubmoduleAddCommand to use the new layout.
Bug: 469666
Change-Id: Ie97dc0607b71499560444616f362bccee9cce515
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java index 3b2fa6c37d..72cc51be98 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java @@ -391,6 +391,17 @@ public class CloneCommandTest extends RepositoryTestCase { git.add().addFilepattern(path) .addFilepattern(Constants.DOT_GIT_MODULES).call(); git.commit().setMessage("adding submodule").call(); + try (SubmoduleWalk walk = SubmoduleWalk.forIndex(git.getRepository())) { + assertTrue(walk.next()); + Repository subRepo = walk.getRepository(); + addRepoToClose(subRepo); + assertNotNull(subRepo); + assertEquals( + new File(git.getRepository().getWorkTree(), walk.getPath()), + subRepo.getWorkTree()); + assertEquals(new File(new File(git.getRepository().getDirectory(), + "modules"), walk.getPath()), subRepo.getDirectory()); + } File directory = createTempDirectory("testCloneRepositoryWithSubmodules"); CloneCommand clone = Git.cloneRepository(); |