From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/main/java/com/gitblit/git/RepositoryResolver.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index 8615eea..208c1ae 100644
--- a/src/main/java/com/gitblit/git/RepositoryResolver.java
+++ b/src/main/java/com/gitblit/git/RepositoryResolver.java
@@ -27,7 +27,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitblit.GitBlit;
+import com.gitblit.manager.IGitblit;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
@@ -41,9 +41,9 @@
private final Logger logger = LoggerFactory.getLogger(RepositoryResolver.class);
- private final GitBlit gitblit;
+ private final IGitblit gitblit;
- public RepositoryResolver(GitBlit gitblit) {
+ public RepositoryResolver(IGitblit gitblit) {
super(gitblit.getRepositoriesFolder(), true);
this.gitblit = gitblit;
}
--
Gitblit v1.9.1