Merge "Add new submodule layout to SubmoduleAddCommand"
This commit is contained in:
commit
f9380fb479
|
@ -391,6 +391,17 @@ public void testCloneRepositoryWithSubmodules() throws Exception {
|
|||
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();
|
||||
|
|
|
@ -173,6 +173,8 @@ public Repository call() throws GitAPIException {
|
|||
CloneCommand clone = Git.cloneRepository();
|
||||
configure(clone);
|
||||
clone.setDirectory(moduleDirectory);
|
||||
clone.setGitDir(new File(new File(repo.getDirectory(),
|
||||
Constants.MODULES), path));
|
||||
clone.setURI(resolvedUri);
|
||||
if (monitor != null)
|
||||
clone.setProgressMonitor(monitor);
|
||||
|
|
Loading…
Reference in New Issue