From 56619e42f0a1e555c004374e7f2b13f744ab23f5 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 16 Apr 2016 15:17:12 -0400
Subject: [PATCH] Merge pull request #1047 from yyjdelete/patch-1
---
src/main/java/com/gitblit/servlet/FilestoreServlet.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/FilestoreServlet.java b/src/main/java/com/gitblit/servlet/FilestoreServlet.java
index 1975148..4af9084 100644
--- a/src/main/java/com/gitblit/servlet/FilestoreServlet.java
+++ b/src/main/java/com/gitblit/servlet/FilestoreServlet.java
@@ -63,7 +63,7 @@
public static final String GIT_LFS_META_MIME = "application/vnd.git-lfs+json";
- public static final String REGEX_PATH = "^(.*?)/(r|git)/(.*?)/info/lfs/objects/(batch|" + Constants.REGEX_SHA256 + ")";
+ public static final String REGEX_PATH = "^(.*?)/(r)/(.*?)/info/lfs/objects/(batch|" + Constants.REGEX_SHA256 + ")";
public static final int REGEX_GROUP_BASE_URI = 1;
public static final int REGEX_GROUP_PREFIX = 2;
public static final int REGEX_GROUP_REPOSITORY = 3;
@@ -238,7 +238,10 @@
}
} else {
response.setStatus(responseObject.error.code);
- serialize(response, responseObject.error);
+
+ if (isMetaRequest) {
+ serialize(response, responseObject.error);
+ }
}
};
--
Gitblit v1.9.1