From 7a3dd3570e2c3daa403d71fff2d71bc10b5eb0c4 Mon Sep 17 00:00:00 2001 From: stip Date: Thu, 22 Sep 2016 17:32:28 -0700 Subject: [PATCH] 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 --- git_cl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git_cl.py b/git_cl.py index dbf0d2c64..133713b07 100755 --- a/git_cl.py +++ b/git_cl.py @@ -1375,8 +1375,8 @@ class Changelist(object): ('\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 @@ def CMDupstream(parser, args): 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(),))