Stop defaulting unrecognized branches to master except for handful of special refs

git_cl.py

Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index bcd4a6252b018978cc860b3ebebf75dd6f197d54..850388eb64a24745fd25564735ebbaaa3cf6cb47 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -56,6 +56,8 @@ POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingGit'
 CHANGE_ID = 'Change-Id:'
+REFS_THAT_DEFAULT_TO_MASTER = ('refs/remotes/origin/lkgr',

[agable, 2015/03/02 23:11:34]

It might make more sense to have a REFS_THAT_ALIAS_TO_OTHER_REFS map, which maps
lkgr and lkcr to master. Not sure if you want to go the general route for
forwards-compatibility, or use this highly specific route to prevent other
people from abusing the mechanism. Either is fine by me.

[rmistry, 2015/03/03 12:26:23]

Lets try the general route for forwards-compatibility. Done.

+                               'refs/remotes/origin/lkcr')
 
 # Valid extensions for files we want to lint.
 DEFAULT_LINT_REGEX = r"(.*\.cpp|.*\.cc|.*\.h)"
@@ -1790,9 +1792,8 @@ def GetTargetRef(remote, remote_branch, target_branch, pending_prefix):
       if not match:
         # This is a branch path but not one we recognize; use as-is.
         remote_branch = target_branch
-  elif (not remote_branch.startswith('refs/remotes/branch-heads') and
-        not remote_branch.startswith('refs/remotes/%s/refs' % remote)):
-    # Default to master for refs that are not branches.
+  elif remote_branch in REFS_THAT_DEFAULT_TO_MASTER:
+    # Handle the special refs that should land in master.
     remote_branch = 'refs/remotes/%s/master' % remote
 
   # Create the true path to the remote branch.