From dabbea27f0cad4102050370bc1c1bd78819f3f44 Mon Sep 17 00:00:00 2001 From: "hinoka@google.com" Date: Mon, 21 Apr 2014 23:58:11 +0000 Subject: [PATCH] add --ignore-submodules to apply_issue.py Apply_issue should not try to check if there are modified files within submodules. BUG= Review URL: https://codereview.chromium.org/246093002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265115 0039d316-1c4b-4281-b951-d872f2087c98 --- checkout.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checkout.py b/checkout.py index 141bf2584..022076c40 100644 --- a/checkout.py +++ b/checkout.py @@ -616,7 +616,7 @@ class GitCheckout(CheckoutBase): def _sync_remote_branch(self): """Syncs the remote branch.""" # We do a 'git pull origin master:refs/remotes/origin/master' instead of - # 'git pull origin master' because from the manpage for git-pull: + # 'git pull origin master' because from the manpage for git-pull: # A parameter without a colon is equivalent to : when # pulling/fetching, so it merges into the current branch without # storing the remote branch anywhere locally. @@ -631,7 +631,7 @@ class GitCheckout(CheckoutBase): """Gets the current revision (in unicode) from the local branch.""" return unicode(self._check_output_git(['rev-parse', 'HEAD']).strip()) - def apply_patch(self, patches, post_processors=None, verbose=False, + def apply_patch(self, patches, post_processors=None, verbose=False, name=None, email=None): """Applies a patch on 'working_branch' and switches to it. @@ -723,7 +723,7 @@ class GitCheckout(CheckoutBase): base_ref = '%s/%s' % (self.remote, self.remote_branch or self.master_branch) found_files = self._check_output_git( - ['diff', base_ref, + ['diff', base_ref, '--ignore-submodules', '--name-only']).splitlines(False) assert sorted(patches.filenames) == sorted(found_files), ( sorted(patches.filenames), sorted(found_files)) @@ -735,7 +735,7 @@ class GitCheckout(CheckoutBase): current_branch = self._check_output_git( ['rev-parse', '--abbrev-ref', 'HEAD']).strip() assert current_branch == self.working_branch - + commit_cmd = ['commit', '--amend', '-m', commit_message] if user and user != self.commit_user: # We do not have the first or last name of the user, grab the username