Make merge script bypass hooks on upload.

tools/push-to-trunk/common_includes.py

 #!/usr/bin/env python
 # Copyright 2013 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 539 matching lines @@
   MESSAGE = "Upload for code review."
 
   def RunStep(self):
     if self._options.reviewer:
       print "Using account %s for review." % self._options.reviewer
       reviewer = self._options.reviewer
     else:
       print "Please enter the email address of a V8 reviewer for your patch: ",
       self.DieNoManualMode("A reviewer must be specified in forced mode.")
       reviewer = self.ReadLine()
-    self.GitUpload(reviewer, self._options.author, self._options.force_upload)
+    self.GitUpload(reviewer, self._options.author, self._options.force_upload,
+                   bypass_hooks=self._options.bypass_upload_hooks)
 
 
 class DetermineV8Sheriff(Step):
   MESSAGE = "Determine the V8 sheriff for code review."
 
   def RunStep(self):
     self["sheriff"] = None
     if not self._options.sheriff:  # pragma: no cover
       return
 
@@ skipping 102 matching lines @@
       parser.print_help()
       return None
     if options.svn and not options.svn_config:
       print "Using pure svn for committing requires also --svn-config"
       parser.print_help()
       return None
 
     # Defaults for options, common to all scripts.
     options.manual = getattr(options, "manual", True)
     options.force = getattr(options, "force", False)
+    options.bypass_upload_hooks = False
 
     # Derived options.
     options.requires_editor = not options.force
     options.wait_for_lgtm = not options.force
     options.force_readline_defaults = not options.manual
     options.force_upload = not options.manual
 
     # Process script specific options.
     if not self._ProcessOptions(options):
       parser.print_help()
@@ skipping 13 matching lines @@
     for (number, step_class) in enumerate(step_classes):
       steps.append(MakeStep(step_class, number, self._state, self._config,
                             options, self._side_effect_handler))
     for step in steps[options.step:]:
       if step.Run():
         return 0
     return 0
 
   def Run(self, args=None):
     return self.RunSteps(self._Steps(), args)