From 706ab77fc0386756e14b68ac0b91d70ed86a1394 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 13 Sep 2012 10:30:07 -0400 Subject: [PATCH] Merge pull request #35 from Mrbytes/master --- src/com/gitblit/utils/TicgitUtils.java | 24 +----------------------- 1 files changed, 1 insertions(+), 23 deletions(-) diff --git a/src/com/gitblit/utils/TicgitUtils.java b/src/com/gitblit/utils/TicgitUtils.java index 87a2b3a..aab5a3e 100644 --- a/src/com/gitblit/utils/TicgitUtils.java +++ b/src/com/gitblit/utils/TicgitUtils.java @@ -48,29 +48,7 @@ * @return a refmodel for the ticgit branch or null */ public static RefModel getTicketsBranch(Repository repository) { - RefModel ticgitBranch = null; - try { - // search for ticgit branch in local heads - for (RefModel ref : JGitUtils.getLocalBranches(repository, false, -1)) { - if (ref.displayName.endsWith("ticgit")) { - ticgitBranch = ref; - break; - } - } - - // search for ticgit branch in remote heads - if (ticgitBranch == null) { - for (RefModel ref : JGitUtils.getRemoteBranches(repository, false, -1)) { - if (ref.displayName.endsWith("ticgit")) { - ticgitBranch = ref; - break; - } - } - } - } catch (Throwable t) { - LOGGER.error("Failed to find ticgit branch!", t); - } - return ticgitBranch; + return JGitUtils.getBranch(repository, "ticgit"); } /** -- Gitblit v1.9.1