commit 5724c961f63a2c92a796a51a429f1ce8b3f517c7
author iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Apr 11 09:32:56 2014 +0000
committer iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Apr 11 09:32:56 2014 +0000
tree 18ef3a9361ece707c20140b30839b32abf69a861
parent 21980029dc9ee5e9e882d9ecd0cf93f0027cf677

Abort `git cl push` if pushing into a local branch.

R=agable@chromium.org, szager@chromium.org
BUG=338102

Review URL: https://codereview.chromium.org/224863006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263202 0039d316-1c4b-4281-b951-d872f2087c98

tests/git_cl_test.py

diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 65da4df..9234fb2 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -270,6 +270,9 @@
       ((['git',
          'config', 'branch.working.merge'],), 'refs/heads/master'),
       ((['git', 'config', 'branch.working.remote'],), 'origin'),
+      ((['git', 'config', 'branch.working.merge'],),
+       'refs/heads/master'),
+      ((['git', 'config', 'branch.working.remote'],), 'origin'),
       ((['git', 'rev-list', '--merges',
          '--grep=^SVN changes up to revision [0-9]*$',
          'refs/remotes/origin/master^!'],), ''),