Switch to -u from deprecated --set-upstream

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 39ff859ee103e97906a3402ad3f9e88dc06d8e59..d52e13325771c9ae09990307eb19ed73efe88d07 100644 (file)
--- 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 3b35c16794b5ee7f07f389fa340e79df323c9392..fcfe500676fdd5c7c6208189394aa6783f3138a7 100644 (file)
--- 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

diff --git a/src/site/tickets_using.mkd b/src/site/tickets_using.mkd
index 3936e00d5a9d6bde9fbab8741da40d78e2070fae..3cda7314987fad5a8f67ef6062cf6265905dccb9 100644 (file)
--- a/src/site/tickets_using.mkd
+++ b/src/site/tickets_using.mkd
@@ -28,7 +28,7 @@ Any authenticated user who can clone your repository.
     ...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 @@ Any authenticated user who can clone your repository.
     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