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

Unified Diff: git_cl.py

Issue 726673008: Fix git-cl-dcommit hook. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 6 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index f50e7023f329324eb383c179682bc2a2ebe4720c..d9b80aa7000ccc98bcc1cd57d6a733c9a2eddc57 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)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698