From c57b583ef60442f86085285bddc946c18ac1cc18 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 13:33:26 -0400
Subject: [PATCH] Merged #59 "Update git ticket instructions for deprecated --set-upstream"

---
 src/main/java/pt.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/pt.py b/src/main/java/pt.py
index 3b35c16..fcfe500 100644
--- a/src/main/java/pt.py
+++ b/src/main/java/pt.py
@@ -289,7 +289,7 @@
             # set the upstream branch configuration
             args.id = int(fields[1].strip()[len('--> #'):])
             __call(['git', 'fetch', args.remote])
-            __call(['git', 'branch', '--set-upstream-to={}/ticket/{:d}'.format(args.remote, args.id)])
+            __call(['git', 'branch', '-u', '{}/ticket/{:d}'.format(args.remote, args.id)])
             break
 
     return

--
Gitblit v1.9.1