From a1950c4e56622c0b89a3e0d1c5579e5e1c6b2887 Mon Sep 17 00:00:00 2001 From: "iannucci@chromium.org" Date: Fri, 5 Dec 2014 22:15:56 +0000 Subject: [PATCH] Fix git-cl-dcommit hook tests. TBR=agable@chromium.org, jrobbins@chromium.org, maruel@chromium.org BUG= Review URL: https://codereview.chromium.org/726673008 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293275 0039d316-1c4b-4281-b951-d872f2087c98 --- git_cl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git_cl.py b/git_cl.py index f50e7023f..d9b80aa70 100755 --- a/git_cl.py +++ b/git_cl.py @@ -2115,7 +2115,7 @@ def SendUpstream(parser, args, cmd): revision = RunGit(['rev-parse', 'HEAD']).strip() else: # dcommit the merge branch. - cmd = [ + cmd_args = [ 'svn', 'dcommit', '-C%s' % options.similarity, '--no-rebase', '--rmdir', @@ -2126,8 +2126,8 @@ def SendUpstream(parser, args, cmd): remote_url = cl.GetGitSvnRemoteUrl() if urlparse.urlparse(remote_url).scheme == 'http': remote_url = remote_url.replace('http://', 'https://') - cmd.append('--commit-url=%s' % remote_url) - _, output = RunGitWithCode(cmd) + cmd_args.append('--commit-url=%s' % remote_url) + _, output = RunGitWithCode(cmd_args) if 'Committed r' in output: revision = re.match( '.*?\nCommitted r(\\d+)', output, re.DOTALL).group(1)