Change usage of deprecated flag.
BUG=Every time I run 'git cl upstream' I get "The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to."
Review-Url: https://codereview.chromium.org/2352393003
diff --git a/git_cl.py b/git_cl.py
index dbf0d2c..133713b 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1375,8 +1375,8 @@
('\nFailed to diff against upstream branch %s\n\n'
'This branch probably doesn\'t exist anymore. To reset the\n'
'tracking branch, please run\n'
- ' git branch --set-upstream %s trunk\n'
- 'replacing trunk with origin/master or the relevant branch') %
+ ' git branch --set-upstream-to origin/master %s\n'
+ 'or replace origin/master with the relevant branch') %
(upstream_branch, self.GetBranch()))
issue = self.GetIssue()
@@ -4869,7 +4869,7 @@
if args:
# One arg means set upstream branch.
branch = cl.GetBranch()
- RunGit(['branch', '--set-upstream', branch, args[0]])
+ RunGit(['branch', '--set-upstream-to', args[0], branch])
cl = Changelist()
print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))