From 9e7041fad08a4e83be6ef18d30f0902b8a39bcdb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 10 May 2013 08:20:39 -0400
Subject: [PATCH] Fix NPEs when initializing on a servlet container which returns a null contextFolder
---
src/test/java/com/gitblit/tests/PushLogTest.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/PushLogTest.java b/src/test/java/com/gitblit/tests/PushLogTest.java
index aa4cf41..0f46b53 100644
--- a/src/test/java/com/gitblit/tests/PushLogTest.java
+++ b/src/test/java/com/gitblit/tests/PushLogTest.java
@@ -19,7 +19,10 @@
import java.io.IOException;
import java.util.List;
-import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.RepositoryCache.FileKey;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.eclipse.jgit.util.FS;
import org.junit.Test;
import com.gitblit.models.PushLogEntry;
@@ -30,7 +33,8 @@
@Test
public void testPushLog() throws IOException {
String name = "~james/helloworld.git";
- FileRepository repository = new FileRepository(new File(GitBlitSuite.REPOSITORIES, name));
+ File gitDir = FileKey.resolve(new File(GitBlitSuite.REPOSITORIES, name), FS.DETECTED);
+ Repository repository = new FileRepositoryBuilder().setGitDir(gitDir).build();
List<PushLogEntry> pushes = PushLogUtils.getPushLog(name, repository);
GitBlitSuite.close(repository);
}
--
Gitblit v1.9.1