From 1aabf0a23f112f06cd7ea5e43a11c11bd177872b Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 27 Mar 2012 16:51:35 -0400 Subject: [PATCH] Implemented support for "default" branch --- src/com/gitblit/client/RepositoriesPanel.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java index 0643b60..685a70a 100644 --- a/src/com/gitblit/client/RepositoriesPanel.java +++ b/src/com/gitblit/client/RepositoriesPanel.java @@ -27,6 +27,7 @@ import java.awt.event.MouseEvent; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.swing.JButton; @@ -44,6 +45,7 @@ import javax.swing.table.TableCellRenderer; import javax.swing.table.TableRowSorter; +import com.gitblit.Constants; import com.gitblit.Constants.RpcRequest; import com.gitblit.models.FeedModel; import com.gitblit.models.RepositoryModel; @@ -357,7 +359,7 @@ dialog.setTeams(gitblit.getTeamnames(), null); dialog.setRepositories(gitblit.getRepositories()); dialog.setFederationSets(gitblit.getFederationSets(), null); - dialog.setIndexedBranches(new ArrayList<String>(), null); + dialog.setIndexedBranches(new ArrayList<String>(Arrays.asList(Constants.DEFAULT_BRANCH)), null); dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null), gitblit.getPreReceiveScriptsInherited(null), null); dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null), @@ -420,7 +422,10 @@ dialog.setTeams(gitblit.getTeamnames(), gitblit.getPermittedTeamnames(repository)); dialog.setRepositories(gitblit.getRepositories()); dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets); - dialog.setIndexedBranches(repository.getLocalBranches(), repository.indexedBranches); + List<String> allLocalBranches = new ArrayList<String>(); + allLocalBranches.add(Constants.DEFAULT_BRANCH); + allLocalBranches.addAll(repository.getLocalBranches()); + dialog.setIndexedBranches(allLocalBranches, repository.indexedBranches); dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(repository), gitblit.getPreReceiveScriptsInherited(repository), repository.preReceiveScripts); dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(repository), -- Gitblit v1.9.1