Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3712)

Unified Diff: checkout.py

Issue 202483008: Assume 'master' when remote branch not specified. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Fix apply_issue Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apply_issue.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: checkout.py
diff --git a/checkout.py b/checkout.py
index ec308013d42c5163ef617cdcd6d9ff0466615cad..b21f03c7ee3dda776afa82b67a647e71a0899088 100644
--- a/checkout.py
+++ b/checkout.py
@@ -562,6 +562,7 @@ 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'
@@ -624,7 +625,9 @@ class GitCheckout(CheckoutBase):
# trying again?
if self.remote_branch:
Ryan Tseng 2014/03/19 01:54:28 Maybe "if self.remote_branch and not self.base_ref
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 tracki
'--quiet'])
for index, p in enumerate(patches):
« no previous file with comments | « apply_issue.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698