Fix git interface for merge script.

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 353 matching lines @@
     # Remove 'origin/branch-heads/' prefix.
     return map(lambda s: s[20:], branches)
 
   def RemoteMasterBranch(self):
     return "origin/master"
 
   def RemoteCandidateBranch(self):
     return "origin/candidates"
 
   def RemoteBranch(self, name):
+    if name in ["candidates", "master"]:
+      return "origin/%s" % name
     return "origin/branch-heads/%s" % name
 
 
 class GitReadSvnWriteInterface(GitReadOnlyMixin, GitSvnInterface):
   pass
 
 
 VC_INTERFACES = {
   "git_svn": GitSvnInterface,
   "git_read_svn_write": GitReadSvnWriteInterface,
@@ skipping 450 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)