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

fix exception with empty git repositories

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-08-03 16:20:01 +02:00
parent d437602b39
commit 71a3776664
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scm-test/src/main/java/sonia/scm/repository/client/GitRepositoryClient.java
View File

@@ -43,6 +43,7 @@ import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.dircache.DirCacheCheckout;
import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.errors.NoRemoteRepositoryException;
import org.eclipse.jgit.errors.NotSupportedException; import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Constants;
@@ -155,9 +156,13 @@ public class GitRepositoryClient implements RepositoryClient
try try
{ {
final FetchResult r = runFetch(); final FetchResult r = runFetch();
final Ref branch = guessHEAD(r);
doCheckout(branch); if (r != null)
{
final Ref branch = guessHEAD(r);
doCheckout(branch);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -383,28 +388,39 @@ public class GitRepositoryClient implements RepositoryClient
* @return * @return
* *
* @throws NotSupportedException * @throws NotSupportedException
* @throws RepositoryClientException
* @throws TransportException * @throws TransportException
* @throws URISyntaxException * @throws URISyntaxException
*/ */
private FetchResult runFetch() private FetchResult runFetch()
throws NotSupportedException, URISyntaxException, TransportException throws NotSupportedException, URISyntaxException, TransportException,
RepositoryClientException
{ {
Transport tn = Transport.open(repository, Constants.HEAD); FetchResult r = null;
if (credentialsProvider != null)
{
tn.setCredentialsProvider(credentialsProvider);
}
FetchResult r;
try try
{ {
r = tn.fetch(new TextProgressMonitor(), null); Transport tn = Transport.open(repository, Constants.HEAD);
if (credentialsProvider != null)
{
tn.setCredentialsProvider(credentialsProvider);
}
try
{
r = tn.fetch(new TextProgressMonitor(), null);
}
finally
{
tn.close();
}
} }
finally catch (NoRemoteRepositoryException ex)
{ {
tn.close();
// empty repository, call init
init();
} }
return r; return r;