From 4b0e0641076f802e8da1695fe8a40ff7646b811a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Oct 2011 08:05:40 -0400
Subject: [PATCH] Merge branch 'master' into rpc
---
src/com/gitblit/wicket/panels/BranchesPanel.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.java b/src/com/gitblit/wicket/panels/BranchesPanel.java
index 24e0e98..d45c0e6 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.java
@@ -142,7 +142,9 @@
this, null), BranchesPage.class, WicketUtils.newRepositoryParameter(model.name)));
}
// We always have 1 branch
- hasBranches = branches.size() > 1;
+ hasBranches = (branches.size() > 1)
+ || ((branches.size() == 1) && !branches.get(0).displayName
+ .equalsIgnoreCase("master"));
}
public BranchesPanel hideIfEmpty() {
--
Gitblit v1.9.1