Correctly overwrite author in chromium roll script.

BUG=408523
LOG=n
R=jarin@chromium.org
TBR=jarin@chromium.org

Review URL: https://codereview.chromium.org/535073002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23647 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 8509ddc4
......@@ -86,7 +86,8 @@ class UploadCL(Step):
sheriff = ("\n\nPlease reply to the V8 sheriff %s in case of problems."
% self["sheriff"])
self.GitCommit("%s%s\n\nTBR=%s" %
(commit_title, sheriff, self._options.reviewer))
(commit_title, sheriff, self._options.reviewer),
author=self._options.author)
if not self._options.dry_run:
self.GitUpload(author=self._options.author,
force=True,
......
......@@ -167,13 +167,15 @@ class GitRecipesMixin(object):
# base files were uploaded, if not retry.
self.Git(MakeArgs(args), pipe=False)
def GitCommit(self, message="", file_name=""):
def GitCommit(self, message="", file_name="", author=None):
assert message or file_name
args = ["commit"]
if file_name:
args += ["-aF", Quoted(file_name)]
if message:
args += ["-am", Quoted(message)]
if author:
args += ["--author", "\"%s <%s>\"" % (author, author)]
self.Git(MakeArgs(args))
def GitPresubmit(self):
......
......@@ -842,7 +842,8 @@ def get_list():
Cmd(("git commit -am \"Update V8 to version 3.22.5 "
"(based on bleeding_edge revision r123454).\n\n"
"Please reply to the V8 sheriff c_name@chromium.org in "
"case of problems.\n\nTBR=c_name@chromium.org\""),
"case of problems.\n\nTBR=c_name@chromium.org\" "
"--author \"author@chromium.org <author@chromium.org>\""),
""),
Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f", ""),
]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment