From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 17 Mar 2014 09:36:09 -0400 Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings" --- src/main/java/com/gitblit/git/PatchsetReceivePack.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java index 697b8b9..3ec3086 100644 --- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java +++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java @@ -163,11 +163,11 @@ /** Extracts the ticket id from the ref name */ private long getTicketId(String refName) { + if (refName.indexOf('%') > -1) { + refName = refName.substring(0, refName.indexOf('%')); + } if (refName.startsWith(Constants.R_FOR)) { String ref = refName.substring(Constants.R_FOR.length()); - if (ref.indexOf('%') > -1) { - ref = ref.substring(0, ref.indexOf('%')); - } try { return Long.parseLong(ref); } catch (Exception e) { -- Gitblit v1.9.1