summaryrefslogtreecommitdiffstats
path: root/src/main/java/pt.py
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-05-05 11:33:26 -0600
committerJames Moger <james.moger@gitblit.com>2014-05-05 11:33:26 -0600
commitc57b583ef60442f86085285bddc946c18ac1cc18 (patch)
tree4e00ca52982fc2e70d7b337272d5b3bb2d17ea9b /src/main/java/pt.py
parent8f0f665b9ee4e2cd21e9e0d5d7cfc69b1d19b86f (diff)
parentd69d73e5da5a12f279d5c0c38c871801739f33d6 (diff)
downloadgitblit-c57b583ef60442f86085285bddc946c18ac1cc18.tar.gz
gitblit-c57b583ef60442f86085285bddc946c18ac1cc18.zip
Merged #59 "Update git ticket instructions for deprecated --set-upstream"
Diffstat (limited to 'src/main/java/pt.py')
-rw-r--r--src/main/java/pt.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/pt.py b/src/main/java/pt.py
index 3b35c167..fcfe5006 100644
--- a/src/main/java/pt.py
+++ b/src/main/java/pt.py
@@ -289,7 +289,7 @@ def propose(args):
# 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