From 61df9b9f633cd5ce176077ad0e1ce8436f019f0c Mon Sep 17 00:00:00 2001 From: Markus Fömpe Date: Thu, 26 Jan 2017 13:50:54 +0100 Subject: List branches from only one repository if a repository name is given e.g.: https://localhost:8443/rpc/?req=LIST_REPOSITORY_BRANCHES&name=repo.git Fix #1184 --- src/main/java/com/gitblit/servlet/RpcServlet.java | 4 ++++ src/site/rpc.mkd | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/com/gitblit/servlet/RpcServlet.java b/src/main/java/com/gitblit/servlet/RpcServlet.java index 9809a252..0081367f 100644 --- a/src/main/java/com/gitblit/servlet/RpcServlet.java +++ b/src/main/java/com/gitblit/servlet/RpcServlet.java @@ -133,6 +133,10 @@ public class RpcServlet extends JsonServlet { model.name)); continue; } + if(!StringUtils.isEmpty(objectName) && !objectName.equals(model.name)) { + // skip repository if a name was submitted and it doesn't match + continue; + } // get local branches Repository repository = gitblit.getRepository(model.name); List refs = JGitUtils.getLocalBranches(repository, false, -1); diff --git a/src/site/rpc.mkd b/src/site/rpc.mkd index 4b065bf0..e51fbaae 100644 --- a/src/site/rpc.mkd +++ b/src/site/rpc.mkd @@ -62,6 +62,7 @@ The Gitblit API includes methods for retrieving and interpreting RSS feeds. The Gitblit v1.3.16 Gitblit v1.4.07 Gitblit v1.6.08 +Gitblit v1.9.09 @@ -80,7 +81,7 @@ Use *SET_REPOSITORY_TEAM_PERMISSIONS* instead. web.enableRpcServlet=true GET_PROTOCOL--2-Integer LIST_REPOSITORIES--1-Map<String, RepositoryModel> -LIST_BRANCHES--1-Map<String, List<String>> +LIST_BRANCHES[repository name]-9-Map<String, List<String>> LIST_SETTINGS--1-ServerSettings (basic keys) GET_USERuser name-6-UserModel FORK_REPOSITORYrepository name-8-- -- cgit v1.2.3