From a28ae3995fc4655be1400cf694e4b0d97db5df45 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Sat, 1 Aug 2015 17:03:11 +0200 Subject: containsGitModulesFile() should not crash on bare repository Change-Id: Iba7e4674b3d33c730613a6ac703977f48b015853 Signed-off-by: Andrey Loskutov --- .../tst/org/eclipse/jgit/submodule/SubmoduleWalkTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleWalkTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleWalkTest.java index f7acaa7880..72b4611df5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleWalkTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleWalkTest.java @@ -65,6 +65,7 @@ import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.NoWorkTreeException; +import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.Config; @@ -100,6 +101,13 @@ public class SubmoduleWalkTest extends RepositoryTestCase { assertEquals(ObjectId.zeroId(), gen.getObjectId()); } + @Test + public void bareRepositoryWithNoSubmodules() throws IOException { + FileRepository bareRepo = createBareRepository(); + boolean result = SubmoduleWalk.containsGitModulesFile(bareRepo); + assertFalse(result); + } + @Test public void repositoryWithRootLevelSubmodule() throws IOException, ConfigInvalidException, NoWorkTreeException, GitAPIException { -- cgit v1.2.3