From d69d73e5da5a12f279d5c0c38c871801739f33d6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 13:31:56 -0400
Subject: [PATCH] Switch to -u from deprecated --set-upstream
---
src/main/java/com/gitblit/wicket/pages/propose_git.md | 2 +-
src/main/java/pt.py | 2 +-
src/site/tickets_using.mkd | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/propose_git.md b/src/main/java/com/gitblit/wicket/pages/propose_git.md
index 39ff859..d52e133 100644
--- a/src/main/java/com/gitblit/wicket/pages/propose_git.md
+++ b/src/main/java/com/gitblit/wicket/pages/propose_git.md
@@ -2,5 +2,5 @@
cd ${repo}
git checkout -b ${reviewBranch} origin/${integrationBranch}
...
- git push --set-upstream origin ${reviewBranch}
+ git push -u origin ${reviewBranch}
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
diff --git a/src/site/tickets_using.mkd b/src/site/tickets_using.mkd
index 3936e00..3cda731 100644
--- a/src/site/tickets_using.mkd
+++ b/src/site/tickets_using.mkd
@@ -28,7 +28,7 @@
...add a single commit...
git push origin HEAD:refs/for/new
# read ticket id from server output
- git branch --set-upstream-to=origin/ticket/{id}
+ git branch -u origin/ticket/{id}
### Creating the first Patchset for an Existing Ticket
@@ -42,7 +42,7 @@
cd repo
git checkout -b ticket/{id}
...add one or more commits...
- git push --set-upstream origin ticket/{id}
+ git push -u origin ticket/{id}
### Safely adding commits to a Patchset for an Existing Ticket
--
Gitblit v1.9.1