From e9dac2e9ead1decb8abb1bf9df3cd638a2f5eb04 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 15 Oct 2013 08:13:04 -0400
Subject: [PATCH] Merge pull request #118 from Mrbytes/master
---
src/main/java/com/gitblit/git/GitblitUploadPackFactory.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
index 1756ac5..01dfc08 100644
--- a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
+++ b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
@@ -16,7 +16,6 @@
package com.gitblit.git;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -30,15 +29,16 @@
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.transport.resolver.UploadPackFactory;
+import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.models.UserModel;
/**
* The upload pack factory creates an upload pack which controls what refs are
* advertised to cloning/pulling clients.
- *
+ *
* @author James Moger
- *
+ *
* @param <X> the connection type
*/
public class GitblitUploadPackFactory<X> implements UploadPackFactory<X> {
@@ -51,7 +51,7 @@
int timeout = 0;
if (req instanceof HttpServletRequest) {
- // http/https request may or may not be authenticated
+ // http/https request may or may not be authenticated
user = GitBlit.self().authenticate((HttpServletRequest) req);
if (user == null) {
user = UserModel.ANONYMOUS;
@@ -67,7 +67,7 @@
UploadPack up = new UploadPack(db);
up.setRefFilter(refFilter);
up.setTimeout(timeout);
-
+
return up;
}
@@ -76,13 +76,13 @@
* requesting user.
*/
public static class UserRefFilter implements RefFilter {
-
+
final UserModel user;
-
+
public UserRefFilter(UserModel user) {
this.user = user;
}
-
+
@Override
public Map<String, Ref> filter(Map<String, Ref> refs) {
if (user.canAdmin()) {
@@ -94,7 +94,7 @@
// JGit's RefMap is custom and does not support iterator removal :(
List<String> toRemove = new ArrayList<String>();
for (String ref : refs.keySet()) {
- if (ref.startsWith("refs/gitblit/")) {
+ if (ref.startsWith(Constants.R_GITBLIT)) {
toRemove.add(ref);
}
}
@@ -104,4 +104,4 @@
return refs;
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1