Revert making apply_issue assume 'master'

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257841 0039d316-1c4b-4281-b951-d872f2087c98
experimental/szager/collated-output
agable@chromium.org 11 years ago
parent e569f50330
commit fa3c388ec5

@ -161,13 +161,8 @@ def main():
if scm_type == 'svn':
scm_obj = checkout.SvnCheckout(full_dir, None, None, None, None)
elif scm_type == 'git':
scm_obj = checkout.GitCheckout(root_dir=full_dir,
project_name=None,
remote_branch='master',
git_url=None,
commit_user=None,
base_ref=options.base_ref,
post_processors=None)
scm_obj = checkout.GitCheckout(full_dir, None, None, None, None,
base_ref=options.base_ref,)
elif scm_type == None:
scm_obj = checkout.RawCheckout(full_dir, None, None)
else:

@ -562,7 +562,6 @@ class GitCheckout(CheckoutBase):
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'
@ -625,8 +624,7 @@ class GitCheckout(CheckoutBase):
# trying again?
if self.remote_branch:
self._check_call_git(
['checkout',
'-b', self.working_branch,
['checkout', '-b', self.working_branch,
'-t', '%s/%s' % (self.pull_remote, self.remote_branch),
'--quiet'])

Loading…
Cancel
Save