Merge "InitCommand: Don't leave Repository open after Git is closed"

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java

@@ -69,14 +69,14 @@ public class InitCommandTest extends RepositoryTestCase {
 	}
 
 	@Test
-	public void testInitRepository() throws IOException, JGitInternalException,
+	public void testInitRepository()
-			GitAPIException {
+			throws IOException, JGitInternalException, GitAPIException {
 		File directory = createTempDirectory("testInitRepository");
 		InitCommand command = new InitCommand();
 		command.setDirectory(directory);
-		Repository repository = command.call().getRepository();
+		try (Git git = command.call()) {
-		addRepoToClose(repository);
+			assertNotNull(git.getRepository());
-		assertNotNull(repository);
+		}
 	}
 
 	@Test
@@ -89,9 +89,9 @@ public class InitCommandTest extends RepositoryTestCase {
 		assertTrue(directory.listFiles().length > 0);
 		InitCommand command = new InitCommand();
 		command.setDirectory(directory);
-		Repository repository = command.call().getRepository();
+		try (Git git = command.call()) {
-		addRepoToClose(repository);
+			assertNotNull(git.getRepository());
-		assertNotNull(repository);
+		}
 	}
 
 	@Test
@@ -101,10 +101,11 @@ public class InitCommandTest extends RepositoryTestCase {
 		InitCommand command = new InitCommand();
 		command.setDirectory(directory);
 		command.setBare(true);
-		Repository repository = command.call().getRepository();
+		try (Git git = command.call()) {
-		addRepoToClose(repository);
+			Repository repository = git.getRepository();
-		assertNotNull(repository);
+			assertNotNull(repository);
-		assertTrue(repository.isBare());
+			assertTrue(repository.isBare());
+		}
 	}
 
 	// non-bare repos where gitDir and directory is set. Same as
@@ -117,11 +118,12 @@ public class InitCommandTest extends RepositoryTestCase {
 		InitCommand command = new InitCommand();
 		command.setDirectory(wt);
 		command.setGitDir(gitDir);
-		Repository repository = command.call().getRepository();
+		try (Git git = command.call()) {
-		addRepoToClose(repository);
+			Repository repository = git.getRepository();
-		assertNotNull(repository);
+			assertNotNull(repository);
-		assertEqualsFile(wt, repository.getWorkTree());
+			assertEqualsFile(wt, repository.getWorkTree());
-		assertEqualsFile(gitDir, repository.getDirectory());
+			assertEqualsFile(gitDir, repository.getDirectory());
+		}
 	}
 
 	// non-bare repos where only gitDir is set. Same as
@@ -135,12 +137,13 @@ public class InitCommandTest extends RepositoryTestCase {
 		File gitDir = createTempDirectory("testInitRepository/.git");
 		InitCommand command = new InitCommand();
 		command.setGitDir(gitDir);
-		Repository repository = command.call().getRepository();
+		try (Git git = command.call()) {
-		addRepoToClose(repository);
+			Repository repository = git.getRepository();
-		assertNotNull(repository);
+			assertNotNull(repository);
-		assertEqualsFile(gitDir, repository.getDirectory());
+			assertEqualsFile(gitDir, repository.getDirectory());
-		assertEqualsFile(new File(reader.getProperty("user.dir")),
+			assertEqualsFile(new File(reader.getProperty("user.dir")),
-				repository.getWorkTree());
+					repository.getWorkTree());
+		}
 	}
 
 	// Bare repos where gitDir and directory is set will only work if gitDir and
@@ -169,13 +172,14 @@ public class InitCommandTest extends RepositoryTestCase {
 				.getAbsolutePath());
 		InitCommand command = new InitCommand();
 		command.setBare(false);
-		Repository repository = command.call().getRepository();
+		try (Git git = command.call()) {
-		addRepoToClose(repository);
+			Repository repository = git.getRepository();
-		assertNotNull(repository);
+			assertNotNull(repository);
-		assertEqualsFile(new File(reader.getProperty("user.dir"), ".git"),
+			assertEqualsFile(new File(reader.getProperty("user.dir"), ".git"),
-				repository.getDirectory());
+					repository.getDirectory());
-		assertEqualsFile(new File(reader.getProperty("user.dir")),
+			assertEqualsFile(new File(reader.getProperty("user.dir")),
-				repository.getWorkTree());
+					repository.getWorkTree());
+		}
 	}
 
 	// If neither directory nor gitDir is set in a bare repo make sure
@@ -189,12 +193,13 @@ public class InitCommandTest extends RepositoryTestCase {
 				.getAbsolutePath());
 		InitCommand command = new InitCommand();
 		command.setBare(true);
-		Repository repository = command.call().getRepository();
+		try (Git git = command.call()) {
-		addRepoToClose(repository);
+			Repository repository = git.getRepository();
-		assertNotNull(repository);
+			assertNotNull(repository);
-		assertEqualsFile(new File(reader.getProperty("user.dir")),
+			assertEqualsFile(new File(reader.getProperty("user.dir")),
-				repository.getDirectory());
+					repository.getDirectory());
-		assertNull(repository.getWorkTree());
+			assertNull(repository.getWorkTree());
+		}
 	}
 
 	// In a non-bare repo when directory and gitDir is set then they shouldn't

org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java

@@ -75,6 +75,9 @@ public class InitCommand implements Callable<Git> {
 	 * {@inheritDoc}
 	 * <p>
 	 * Executes the {@code Init} command.
+	 *
+	 * @return a {@code Git} instance that owns the {@code Repository} that it
+	 *         wraps.
 	 */
 	@Override
 	public Git call() throws GitAPIException {
@@ -120,7 +123,7 @@ public class InitCommand implements Callable<Git> {
 			Repository repository = builder.build();
 			if (!repository.getObjectDatabase().exists())
 				repository.create(bare);
-			return new Git(repository);
+			return new Git(repository, true);
 		} catch (IOException e) {
 			throw new JGitInternalException(e.getMessage(), e);
 		}