From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/pt.py | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/pt.py b/src/main/java/pt.py
index 02c4168..f45bade 100644
--- a/src/main/java/pt.py
+++ b/src/main/java/pt.py
@@ -206,6 +206,12 @@
branches.append(branch.strip())
branch = 'topic/' + args.topic
+ try:
+ int(args.topic)
+ branch = 'ticket/' + args.topic
+ except ValueError:
+ pass
+
illegals = set(branches) & {'topic', branch}
# ensure there are no local branch names that will interfere with branch creation
@@ -246,6 +252,13 @@
push_ref = topic
except ValueError:
pass
+ if curr_branch.startswith('ticket/'):
+ topic = curr_branch[7:].strip()
+ try:
+ int(topic)
+ push_ref = topic
+ except ValueError:
+ pass
if push_ref is None:
push_ref = 'new'
else:
--
Gitblit v1.9.1