Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 05:25:44 +01:00
Code Issues Packages Projects Releases Activity

update jgit to 3.0.0.201306101825-r

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-07-08 14:54:44 +02:00
parent fdac4ff01f
commit d2777df1d4
4 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitRepositoryHandler.java
View File

@@ -38,7 +38,6 @@ package sonia.scm.repository;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import sonia.scm.Type;
@@ -259,19 +258,19 @@ public class GitRepositoryHandler
protected void create(Repository repository, File directory)
throws RepositoryException, IOException
{
FileRepository fr = null;
org.eclipse.jgit.lib.Repository gitRepository = null;
try
{
fr = new FileRepositoryBuilder().setGitDir(
gitRepository = new FileRepositoryBuilder().setGitDir(
directory).readEnvironment().findGitDir().build();
fr.create(true);
gitRepository.create(true);
}
finally
{
if (fr != null)
if (gitRepository != null)
{
fr.close();
gitRepository.close();
}
}
}

3
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
View File

@@ -30,13 +30,14 @@
*/
package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Preconditions;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.internal.storage.file.FileRepository;
import sonia.scm.repository.GitRepositoryHandler;
import sonia.scm.repository.GitUtil;