From 32ada71dcd725abdbacc05ac32001c1f47df2bdc Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 26 Apr 2013 11:53:19 -0400
Subject: [PATCH] Update to Moxie 0.7.4 to fix prefix index merging bug
---
src/main/java/com/gitblit/AddIndexedBranch.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/AddIndexedBranch.java b/src/main/java/com/gitblit/AddIndexedBranch.java
index 67b7742..e2f3dac 100644
--- a/src/main/java/com/gitblit/AddIndexedBranch.java
+++ b/src/main/java/com/gitblit/AddIndexedBranch.java
@@ -25,9 +25,8 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryCache.FileKey;
-import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
-import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.util.FS;
import com.beust.jcommander.JCommander;
@@ -88,8 +87,8 @@
try {
// load repository config
File gitDir = FileKey.resolve(new File(folder, repo), FS.DETECTED);
- FileRepository repository = (FileRepository)new FileRepositoryBuilder().setGitDir(gitDir).build();
- FileBasedConfig config = repository.getConfig();
+ Repository repository = new FileRepositoryBuilder().setGitDir(gitDir).build();
+ StoredConfig config = repository.getConfig();
config.load();
Set<String> indexedBranches = new LinkedHashSet<String>();
--
Gitblit v1.9.1