Browse Source

RepoCommandTest: Don't wrap create{Bare,Work}Directory in t-w-r

These methods add the created Repository into "toClose", and they are
then closed by LocalDiskRepositoryTestCase's tearDown method.

Calling them in try-with-resource causes them to first be closed in
the test method, and then again in tearDown, which results in the use
count going negative and a log message on the console.

While this is not a serious problem, having so many false positives
in the logs will potentially drown out real cases of Repository being
closed too many times.

Change-Id: Ib374445e101dc11cb840957b8b19ee1caf777392
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.7
David Pursehouse 8 years ago committed by Matthias Sohn
parent
commit
883856110c
  1. 213
      org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java

213
org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java

@ -248,12 +248,11 @@ public class RepoCommandTest extends RepositoryTestCase {
@Test @Test
public void testBareRepo() throws Exception { public void testBareRepo() throws Exception {
try (
Repository remoteDb = createBareRepository(); Repository remoteDb = createBareRepository();
Repository tempDb = createWorkRepository()) { Repository tempDb = createWorkRepository();
StringBuilder xmlContent = new StringBuilder(); StringBuilder xmlContent = new StringBuilder();
xmlContent xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />") .append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />") .append("<default revision=\"master\" remote=\"remote1\" />")
@ -274,20 +273,17 @@ public class RepoCommandTest extends RepositoryTestCase {
File gitmodules = new File(localDb.getWorkTree(), ".gitmodules"); File gitmodules = new File(localDb.getWorkTree(), ".gitmodules");
assertTrue("The .gitmodules file should exist", gitmodules.exists()); assertTrue("The .gitmodules file should exist", gitmodules.exists());
// The first line of .gitmodules file should be expected // The first line of .gitmodules file should be expected
BufferedReader reader = new BufferedReader(new FileReader( BufferedReader reader = new BufferedReader(new FileReader(gitmodules));
gitmodules));
String content = reader.readLine(); String content = reader.readLine();
reader.close(); reader.close();
assertEquals( assertEquals("The first line of .gitmodules file should be as expected",
"The first line of .gitmodules file should be as expected",
"[submodule \"foo\"]", content); "[submodule \"foo\"]", content);
// The gitlink should be the same as remote head sha1 // The gitlink should be the same as remote head sha1
String gitlink = localDb.resolve(Constants.HEAD + ":foo").name(); String gitlink = localDb.resolve(Constants.HEAD + ":foo").name();
localDb.close(); localDb.close();
String remote = defaultDb.resolve(Constants.HEAD).name(); String remote = defaultDb.resolve(Constants.HEAD).name();
assertEquals("The gitlink should be the same as remote head", assertEquals("The gitlink should be the same as remote head", remote,
remote, gitlink); gitlink);
}
} }
@Test @Test
@ -370,9 +366,9 @@ public class RepoCommandTest extends RepositoryTestCase {
@Test @Test
public void testRevisionBare() throws Exception { public void testRevisionBare() throws Exception {
try (
Repository remoteDb = createBareRepository(); Repository remoteDb = createBareRepository();
Repository tempDb = createWorkRepository()) { Repository tempDb = createWorkRepository();
StringBuilder xmlContent = new StringBuilder(); StringBuilder xmlContent = new StringBuilder();
xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
@ -395,19 +391,17 @@ public class RepoCommandTest extends RepositoryTestCase {
// The gitlink should be the same as oldCommitId // The gitlink should be the same as oldCommitId
String gitlink = localDb.resolve(Constants.HEAD + ":foo").name(); String gitlink = localDb.resolve(Constants.HEAD + ":foo").name();
localDb.close(); localDb.close();
assertEquals("The gitlink is same as remote head", assertEquals("The gitlink is same as remote head", oldCommitId.name(),
oldCommitId.name(), gitlink); gitlink);
}
} }
@Test @Test
public void testCopyFileBare() throws Exception { public void testCopyFileBare() throws Exception {
try (
Repository remoteDb = createBareRepository(); Repository remoteDb = createBareRepository();
Repository tempDb = createWorkRepository()) { Repository tempDb = createWorkRepository();
StringBuilder xmlContent = new StringBuilder(); StringBuilder xmlContent = new StringBuilder();
xmlContent xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />") .append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />") .append("<default revision=\"master\" remote=\"remote1\" />")
@ -432,8 +426,7 @@ public class RepoCommandTest extends RepositoryTestCase {
assertTrue("The Hello file should exist", hello.exists()); assertTrue("The Hello file should exist", hello.exists());
// The foo/Hello file should be skipped. // The foo/Hello file should be skipped.
File foohello = new File(localDb.getWorkTree(), "foo/Hello"); File foohello = new File(localDb.getWorkTree(), "foo/Hello");
assertFalse( assertFalse("The foo/Hello file should be skipped", foohello.exists());
"The foo/Hello file should be skipped", foohello.exists());
localDb.close(); localDb.close();
// The content of Hello file should be expected // The content of Hello file should be expected
BufferedReader reader = new BufferedReader(new FileReader(hello)); BufferedReader reader = new BufferedReader(new FileReader(hello));
@ -442,16 +435,14 @@ public class RepoCommandTest extends RepositoryTestCase {
assertEquals("The Hello file should have expected content", assertEquals("The Hello file should have expected content",
"branch world", content); "branch world", content);
} }
}
@Test @Test
public void testReplaceManifestBare() throws Exception { public void testReplaceManifestBare() throws Exception {
try (
Repository remoteDb = createBareRepository(); Repository remoteDb = createBareRepository();
Repository tempDb = createWorkRepository()) { Repository tempDb = createWorkRepository();
StringBuilder xmlContent = new StringBuilder(); StringBuilder xmlContent = new StringBuilder();
xmlContent xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />") .append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />") .append("<default revision=\"master\" remote=\"remote1\" />")
@ -459,26 +450,20 @@ public class RepoCommandTest extends RepositoryTestCase {
.append("\" revision=\"").append(BRANCH).append("\" >") .append("\" revision=\"").append(BRANCH).append("\" >")
.append("<copyfile src=\"hello.txt\" dest=\"Hello\" />") .append("<copyfile src=\"hello.txt\" dest=\"Hello\" />")
.append("</project>").append("</manifest>"); .append("</project>").append("</manifest>");
JGitTestUtil.writeTrashFile(tempDb, "old.xml", JGitTestUtil.writeTrashFile(tempDb, "old.xml", xmlContent.toString());
xmlContent.toString());
RepoCommand command = new RepoCommand(remoteDb); RepoCommand command = new RepoCommand(remoteDb);
command.setPath(tempDb.getWorkTree().getAbsolutePath() + "/old.xml") command.setPath(tempDb.getWorkTree().getAbsolutePath() + "/old.xml")
.setURI(rootUri).call(); .setURI(rootUri).call();
xmlContent = new StringBuilder(); xmlContent = new StringBuilder();
xmlContent xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />") .append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />") .append("<default revision=\"master\" remote=\"remote1\" />")
.append("<project path=\"bar\" name=\"") .append("<project path=\"bar\" name=\"").append(defaultUri)
.append(defaultUri) .append("\" revision=\"").append(BRANCH).append("\" >")
.append("\" revision=\"")
.append(BRANCH)
.append("\" >")
.append("<copyfile src=\"hello.txt\" dest=\"Hello.txt\" />") .append("<copyfile src=\"hello.txt\" dest=\"Hello.txt\" />")
.append("</project>").append("</manifest>"); .append("</project>").append("</manifest>");
JGitTestUtil.writeTrashFile(tempDb, "new.xml", JGitTestUtil.writeTrashFile(tempDb, "new.xml", xmlContent.toString());
xmlContent.toString());
command = new RepoCommand(remoteDb); command = new RepoCommand(remoteDb);
command.setPath(tempDb.getWorkTree().getAbsolutePath() + "/new.xml") command.setPath(tempDb.getWorkTree().getAbsolutePath() + "/new.xml")
.setURI(rootUri).call(); .setURI(rootUri).call();
@ -499,8 +484,7 @@ public class RepoCommandTest extends RepositoryTestCase {
File dotmodules = new File(localDb.getWorkTree(), File dotmodules = new File(localDb.getWorkTree(),
Constants.DOT_GIT_MODULES); Constants.DOT_GIT_MODULES);
localDb.close(); localDb.close();
BufferedReader reader = new BufferedReader(new FileReader( BufferedReader reader = new BufferedReader(new FileReader(dotmodules));
dotmodules));
boolean foo = false; boolean foo = false;
boolean bar = false; boolean bar = false;
while (true) { while (true) {
@ -516,24 +500,22 @@ public class RepoCommandTest extends RepositoryTestCase {
assertTrue("The bar submodule should exist", bar); assertTrue("The bar submodule should exist", bar);
assertFalse("The foo submodule shouldn't exist", foo); assertFalse("The foo submodule shouldn't exist", foo);
} }
}
@Test @Test
public void testRemoveOverlappingBare() throws Exception { public void testRemoveOverlappingBare() throws Exception {
try (
Repository remoteDb = createBareRepository(); Repository remoteDb = createBareRepository();
Repository tempDb = createWorkRepository()) { Repository tempDb = createWorkRepository();
StringBuilder xmlContent = new StringBuilder(); StringBuilder xmlContent = new StringBuilder();
xmlContent xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />") .append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />") .append("<default revision=\"master\" remote=\"remote1\" />")
.append("<project path=\"foo/bar\" name=\"") .append("<project path=\"foo/bar\" name=\"").append(groupBUri)
.append(groupBUri).append("\" />") .append("\" />").append("<project path=\"a\" name=\"")
.append("<project path=\"a\" name=\"").append(groupAUri) .append(groupAUri).append("\" />")
.append("\" />").append("<project path=\"foo\" name=\"") .append("<project path=\"foo\" name=\"").append(defaultUri)
.append(defaultUri).append("\" />").append("</manifest>"); .append("\" />").append("</manifest>");
JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", JGitTestUtil.writeTrashFile(tempDb, "manifest.xml",
xmlContent.toString()); xmlContent.toString());
RepoCommand command = new RepoCommand(remoteDb); RepoCommand command = new RepoCommand(remoteDb);
@ -551,8 +533,7 @@ public class RepoCommandTest extends RepositoryTestCase {
File dotmodules = new File(localDb.getWorkTree(), File dotmodules = new File(localDb.getWorkTree(),
Constants.DOT_GIT_MODULES); Constants.DOT_GIT_MODULES);
localDb.close(); localDb.close();
BufferedReader reader = new BufferedReader(new FileReader( BufferedReader reader = new BufferedReader(new FileReader(dotmodules));
dotmodules));
boolean foo = false; boolean foo = false;
boolean foobar = false; boolean foobar = false;
boolean a = false; boolean a = false;
@ -572,7 +553,6 @@ public class RepoCommandTest extends RepositoryTestCase {
assertFalse("The foo/bar submodule shouldn't exist", foobar); assertFalse("The foo/bar submodule shouldn't exist", foobar);
assertTrue("The a submodule should exist", a); assertTrue("The a submodule should exist", a);
} }
}
@Test @Test
public void testIncludeTag() throws Exception { public void testIncludeTag() throws Exception {
@ -670,13 +650,12 @@ public class RepoCommandTest extends RepositoryTestCase {
@Test @Test
public void testTargetBranch() throws Exception { public void testTargetBranch() throws Exception {
try (
Repository remoteDb1 = createBareRepository(); Repository remoteDb1 = createBareRepository();
Repository remoteDb2 = createBareRepository(); Repository remoteDb2 = createBareRepository();
Repository tempDb = createWorkRepository()) { Repository tempDb = createWorkRepository();
StringBuilder xmlContent = new StringBuilder(); StringBuilder xmlContent = new StringBuilder();
xmlContent xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />") .append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />") .append("<default revision=\"master\" remote=\"remote1\" />")
@ -685,102 +664,91 @@ public class RepoCommandTest extends RepositoryTestCase {
JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", JGitTestUtil.writeTrashFile(tempDb, "manifest.xml",
xmlContent.toString()); xmlContent.toString());
RepoCommand command = new RepoCommand(remoteDb1); RepoCommand command = new RepoCommand(remoteDb1);
command command.setPath(
.setPath(tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml")
.setURI(rootUri) .setURI(rootUri).setTargetBranch("test").call();
.setTargetBranch("test") ObjectId branchId = remoteDb1
.call(); .resolve(Constants.R_HEADS + "test^{tree}");
ObjectId branchId = remoteDb1.resolve(
Constants.R_HEADS + "test^{tree}");
command = new RepoCommand(remoteDb2); command = new RepoCommand(remoteDb2);
command command.setPath(
.setPath(tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml")
.setURI(rootUri) .setURI(rootUri).call();
.call();
ObjectId defaultId = remoteDb2.resolve(Constants.HEAD + "^{tree}"); ObjectId defaultId = remoteDb2.resolve(Constants.HEAD + "^{tree}");
assertEquals( assertEquals(
"The tree id of branch db and default db should be the same", "The tree id of branch db and default db should be the same",
branchId, defaultId); branchId, defaultId);
} }
}
@Test @Test
public void testRecordRemoteBranch() throws Exception { public void testRecordRemoteBranch() throws Exception {
try (
Repository remoteDb = createBareRepository(); Repository remoteDb = createBareRepository();
Repository tempDb = createWorkRepository()) { Repository tempDb = createWorkRepository();
StringBuilder xmlContent = new StringBuilder(); StringBuilder xmlContent = new StringBuilder();
xmlContent xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />") .append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />") .append("<default revision=\"master\" remote=\"remote1\" />")
.append("<project path=\"with-branch\" ") .append("<project path=\"with-branch\" ")
.append("revision=\"master\" ") .append("revision=\"master\" ").append("name=\"")
.append("name=\"").append(notDefaultUri).append("\" />") .append(notDefaultUri).append("\" />")
.append("<project path=\"with-long-branch\" ") .append("<project path=\"with-long-branch\" ")
.append("revision=\"refs/heads/master\" ") .append("revision=\"refs/heads/master\" ").append("name=\"")
.append("name=\"").append(defaultUri).append("\" />") .append(defaultUri).append("\" />").append("</manifest>");
.append("</manifest>");
JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", JGitTestUtil.writeTrashFile(tempDb, "manifest.xml",
xmlContent.toString()); xmlContent.toString());
RepoCommand command = new RepoCommand(remoteDb); RepoCommand command = new RepoCommand(remoteDb);
command.setPath(tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") command.setPath(
.setURI(rootUri) tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml")
.setRecordRemoteBranch(true) .setURI(rootUri).setRecordRemoteBranch(true).call();
.call();
// Clone it // Clone it
File directory = createTempDirectory("testBareRepo"); File directory = createTempDirectory("testBareRepo");
try (Repository localDb = Git.cloneRepository() try (Repository localDb = Git.cloneRepository().setDirectory(directory)
.setDirectory(directory)
.setURI(remoteDb.getDirectory().toURI().toString()).call() .setURI(remoteDb.getDirectory().toURI().toString()).call()
.getRepository();) { .getRepository();) {
// The .gitmodules file should exist // The .gitmodules file should exist
File gitmodules = new File(localDb.getWorkTree(), File gitmodules = new File(localDb.getWorkTree(), ".gitmodules");
".gitmodules");
assertTrue("The .gitmodules file should exist", assertTrue("The .gitmodules file should exist",
gitmodules.exists()); gitmodules.exists());
FileBasedConfig c = new FileBasedConfig(gitmodules, FileBasedConfig c = new FileBasedConfig(gitmodules, FS.DETECTED);
FS.DETECTED);
c.load(); c.load();
assertEquals("Recording remote branches should work for short branch descriptions", "master", assertEquals(
"Recording remote branches should work for short branch descriptions",
"master",
c.getString("submodule", "with-branch", "branch")); c.getString("submodule", "with-branch", "branch"));
assertEquals("Recording remote branches should work for full ref specs", "refs/heads/master", assertEquals(
"Recording remote branches should work for full ref specs",
"refs/heads/master",
c.getString("submodule", "with-long-branch", "branch")); c.getString("submodule", "with-long-branch", "branch"));
} }
} }
}
@Test @Test
public void testRecordSubmoduleLabels() throws Exception { public void testRecordSubmoduleLabels() throws Exception {
try (
Repository remoteDb = createBareRepository(); Repository remoteDb = createBareRepository();
Repository tempDb = createWorkRepository()) { Repository tempDb = createWorkRepository();
StringBuilder xmlContent = new StringBuilder(); StringBuilder xmlContent = new StringBuilder();
xmlContent xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />") .append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />") .append("<default revision=\"master\" remote=\"remote1\" />")
.append("<project path=\"test\" ") .append("<project path=\"test\" ")
.append("revision=\"master\" ") .append("revision=\"master\" ").append("name=\"")
.append("name=\"").append(notDefaultUri).append("\" ") .append(notDefaultUri).append("\" ")
.append("groups=\"a1,a2\" />") .append("groups=\"a1,a2\" />").append("</manifest>");
.append("</manifest>");
JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", JGitTestUtil.writeTrashFile(tempDb, "manifest.xml",
xmlContent.toString()); xmlContent.toString());
RepoCommand command = new RepoCommand(remoteDb); RepoCommand command = new RepoCommand(remoteDb);
command.setPath(tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") command.setPath(
.setURI(rootUri) tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml")
.setRecordSubmoduleLabels(true) .setURI(rootUri).setRecordSubmoduleLabels(true).call();
.call();
// Clone it // Clone it
File directory = createTempDirectory("testBareRepo"); File directory = createTempDirectory("testBareRepo");
try (Repository localDb = Git.cloneRepository() try (Repository localDb = Git.cloneRepository().setDirectory(directory)
.setDirectory(directory)
.setURI(remoteDb.getDirectory().toURI().toString()).call() .setURI(remoteDb.getDirectory().toURI().toString()).call()
.getRepository();) { .getRepository();) {
// The .gitattributes file should exist // The .gitattributes file should exist
@ -796,46 +764,38 @@ public class RepoCommandTest extends RepositoryTestCase {
} }
} }
} }
}
@Test @Test
public void testRecordShallowRecommendation() throws Exception { public void testRecordShallowRecommendation() throws Exception {
try (
Repository remoteDb = createBareRepository(); Repository remoteDb = createBareRepository();
Repository tempDb = createWorkRepository()) { Repository tempDb = createWorkRepository();
StringBuilder xmlContent = new StringBuilder(); StringBuilder xmlContent = new StringBuilder();
xmlContent xmlContent.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
.append("<manifest>") .append("<manifest>")
.append("<remote name=\"remote1\" fetch=\".\" />") .append("<remote name=\"remote1\" fetch=\".\" />")
.append("<default revision=\"master\" remote=\"remote1\" />") .append("<default revision=\"master\" remote=\"remote1\" />")
.append("<project path=\"shallow-please\" ") .append("<project path=\"shallow-please\" ").append("name=\"")
.append("name=\"").append(defaultUri).append("\" ") .append(defaultUri).append("\" ").append("clone-depth=\"1\" />")
.append("clone-depth=\"1\" />") .append("<project path=\"non-shallow\" ").append("name=\"")
.append("<project path=\"non-shallow\" ") .append(defaultUri).append("\" />").append("</manifest>");
.append("name=\"").append(defaultUri).append("\" />")
.append("</manifest>");
JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", JGitTestUtil.writeTrashFile(tempDb, "manifest.xml",
xmlContent.toString()); xmlContent.toString());
RepoCommand command = new RepoCommand(remoteDb); RepoCommand command = new RepoCommand(remoteDb);
command.setPath(tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") command.setPath(
.setURI(rootUri) tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml")
.setRecommendShallow(true) .setURI(rootUri).setRecommendShallow(true).call();
.call();
// Clone it // Clone it
File directory = createTempDirectory("testBareRepo"); File directory = createTempDirectory("testBareRepo");
try (Repository localDb = Git.cloneRepository() try (Repository localDb = Git.cloneRepository().setDirectory(directory)
.setDirectory(directory)
.setURI(remoteDb.getDirectory().toURI().toString()).call() .setURI(remoteDb.getDirectory().toURI().toString()).call()
.getRepository();) { .getRepository();) {
// The .gitmodules file should exist // The .gitmodules file should exist
File gitmodules = new File(localDb.getWorkTree(), File gitmodules = new File(localDb.getWorkTree(), ".gitmodules");
".gitmodules");
assertTrue("The .gitmodules file should exist", assertTrue("The .gitmodules file should exist",
gitmodules.exists()); gitmodules.exists());
FileBasedConfig c = new FileBasedConfig(gitmodules, FileBasedConfig c = new FileBasedConfig(gitmodules, FS.DETECTED);
FS.DETECTED);
c.load(); c.load();
assertEquals("Recording shallow configuration should work", "true", assertEquals("Recording shallow configuration should work", "true",
c.getString("submodule", "shallow-please", "shallow")); c.getString("submodule", "shallow-please", "shallow"));
@ -843,7 +803,6 @@ public class RepoCommandTest extends RepositoryTestCase {
c.getString("submodule", "non-shallow", "shallow")); c.getString("submodule", "non-shallow", "shallow"));
} }
} }
}
@Test @Test
public void testRemoteRevision() throws Exception { public void testRemoteRevision() throws Exception {

Loading…
Cancel
Save