Fix merge-to-branch options.

tools/push-to-trunk/merge_to_branch.py

 #!/usr/bin/env python
 # Copyright 2014 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 34 matching lines @@
   DOT_GIT_LOCATION: ".git",
   VERSION_FILE: "src/version.cc",
   TEMPORARY_PATCH_FILE: "/tmp/v8-prepare-merge-tempfile-temporary-patch",
   COMMITMSG_FILE: "/tmp/v8-prepare-merge-tempfile-commitmsg",
   COMMIT_HASHES_FILE: "/tmp/v8-merge-to-branch-tempfile-PATCH_COMMIT_HASHES",
 }
 
 
 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", "")
     self.args = args
 
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
@@ skipping 327 matching lines @@
 def Main():
   parser = BuildOptions()
   (options, args) = parser.parse_args()
   if not ProcessOptions(options, args):
     parser.print_help()
     return 1
   RunMergeToBranch(CONFIG, MergeToBranchOptions(options, args))
 
 if __name__ == "__main__":
   sys.exit(Main())