Change usage of deprecated flag.

git_cl.py

Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index 1b016d46137da6b67efc7bdfdf52dac0ea0e9c8c..ff5faf39982686d00daf942755e92ec4a8e985af 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1375,7 +1375,7 @@ 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'
+           '    git branch --set-upstream-to %s trunk\n'

[iannucci, 2016/09/21 21:54:45]

trunk?

Also arguments are swapped:

  git branch --set-upstream-to origin/master [current branch]

[ghost stip (do not use), 2016/09/21 23:16:39]

Done.

            'replacing trunk with origin/master or the relevant branch') %
           (upstream_branch, self.GetBranch()))
 
@@ -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', branch, args[0]])

[iannucci, 2016/09/21 21:54:45]

arg order

[ghost stip (do not use), 2016/09/21 23:16:39]

arggggggg.....s

     cl = Changelist()
     print('Upstream branch set to %s' % (cl.GetUpstreamBranch(),))