Assume 'master' when remote branch not specified.

checkout.py

 # coding=utf8
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Manages a project checkout.
 
 Includes support for svn, git-svn and git.
 """
 
 import ConfigParser
@@ skipping 544 matching lines @@
 
 class GitCheckout(CheckoutBase):
   """Manages a git checkout."""
   def __init__(self, root_dir, project_name, remote_branch, git_url,
       commit_user, post_processors=None, base_ref=None):
     super(GitCheckout, self).__init__(root_dir, project_name, post_processors)
     self.base_ref = base_ref
     self.git_url = git_url
     self.commit_user = commit_user
     self.remote_branch = remote_branch
+    assert self.remote_branch
     # The working branch where patches will be applied. It will track the
     # remote branch.
     self.working_branch = 'working_branch'
     # There is no reason to not hardcode origin.
     self.pull_remote = 'origin'
     self.push_remote = 'upstream'
 
   def prepare(self, revision):
     """Resets the git repository in a clean state.
 
@@ skipping 40 matching lines @@
                   name=None, email=None):
     """Applies a patch on 'working_branch' and switches to it.
 
     Also commits the changes on the local branch.
 
     Ignores svn properties and raise an exception on unexpected ones.
     """
     post_processors = post_processors or self.post_processors or []
     # It this throws, the checkout is corrupted. Maybe worth deleting it and
     # trying again?
     if self.remote_branch:

[Ryan Tseng, 2014/03/19 01:54:28]

Maybe "if self.remote_branch and not self.base_ref"?

Since if we have a base_ref set, thats actually the ref we want to base this
patch on top of, rather than the remote branch.

We can't use remote branch because a ref isn't always a branch.

       self._check_call_git(
-          ['checkout', '-b', self.working_branch, '-t', self.remote_branch,
+          ['checkout', 
+           '-b', self.working_branch, 
+           '-t', '%s/%s' % (self.pull_remote, self.remote_branch),

[agable, 2014/03/18 21:19:09]

Ravi: apply_issue was checking out a branch tracking local master rather than
origin/master, which is why the skiabuildbot CQ was failing.

            '--quiet'])
 
     for index, p in enumerate(patches):
       stdout = []
       try:
         filepath = os.path.join(self.project_path, p.filename)
         if p.is_delete:
           if (not os.path.exists(filepath) and
               any(p1.source_filename == p.filename for p1 in patches[0:index])):
             # The file was already deleted if a prior patch with file rename
@@ skipping 181 matching lines @@
   def revisions(self, rev1, rev2):
     return self.checkout.revisions(rev1, rev2)
 
   @property
   def project_name(self):
     return self.checkout.project_name
 
   @property
   def project_path(self):
     return self.checkout.project_path