Skip to content

Commit

Permalink
Revert making apply_issue assume 'master'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
[email protected] committed Mar 19, 2014
1 parent e569f50 commit fa3c388
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
9 changes: 2 additions & 7 deletions apply_issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions checkout.py
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,6 @@ def __init__(self, root_dir, project_name, remote_branch, git_url,
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'
Expand Down Expand Up @@ -625,8 +624,7 @@ def apply_patch(self, patches, post_processors=None, verbose=False,
# 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'])

Expand Down

0 comments on commit fa3c388

Please sign in to comment.