summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/git
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-12 20:31:59 -0600
committerJames Moger <james.moger@gitblit.com>2014-03-12 20:31:59 -0600
commited882589e15422e03267ffb9ca6cb1a7376d1822 (patch)
treeb3b89e76916124a53590433f6867d24b9fd7049f /src/main/java/com/gitblit/git
parent95224cfcb42b0d996e0c0abd7098fd97873ffb07 (diff)
parent1207947afee4d7fbd2ee374339d5e84bb0528e9a (diff)
downloadgitblit-ed882589e15422e03267ffb9ca6cb1a7376d1822.tar.gz
gitblit-ed882589e15422e03267ffb9ca6cb1a7376d1822.zip
Merged #30 "Watch list push parameters are not always honored"
Diffstat (limited to 'src/main/java/com/gitblit/git')
-rw-r--r--src/main/java/com/gitblit/git/PatchsetReceivePack.java6
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 697b8b9e..3ec3086a 100644
--- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java
+++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
@@ -163,11 +163,11 @@ public class PatchsetReceivePack extends GitblitReceivePack {
/** 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) {