Fix merge-to-branch options.
BUG= TBR=ulan@chromium.org Review URL: https://codereview.chromium.org/170443003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19453 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
0f2c040c79
commit
77c278b94d
@ -52,11 +52,11 @@ CONFIG = {
|
||||
|
||||
class MergeToBranchOptions(CommonOptions):
|
||||
def __init__(self, options, args):
|
||||
super(MergeToBranchOptions, self).__init__(options, options.m)
|
||||
super(MergeToBranchOptions, self).__init__(options, True)
|
||||
self.requires_editor = True
|
||||
self.wait_for_lgtm = True
|
||||
self.delete_sentinel = options.f
|
||||
self.message = options.m
|
||||
self.message = getattr(options, "message", "")
|
||||
self.revert = "--reverse" if getattr(options, "r", None) else ""
|
||||
self.revert_bleeding_edge = getattr(options, "revert_bleeding_edge", False)
|
||||
self.patch = getattr(options, "p", "")
|
||||
|
Loading…
Reference in New Issue
Block a user