Fix chromium update in chromium roll script.

Needs an extra 'git pull' after a gclient sync, because the solution is
unmanaged now.

TBR=jarin@chromium.org,hinoka@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23612 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

tools/push-to-trunk/chromium_roll.py

@@ -73,6 +73,7 @@ class UpdateChromiumCheckout(Step):
     os.chdir(self["chrome_path"])
     self.GitCheckout("master")
     self._side_effect_handler.Command("gclient", "sync --nohooks")
+    self.GitPull()
     try:
       # TODO(machenbach): Add cwd to git calls.
       os.chdir(os.path.join(self["chrome_path"], "v8"))

tools/push-to-trunk/test_scripts.py

@@ -860,6 +860,7 @@ def get_list():
       Cmd("git status -s -uno", ""),
       Cmd("git checkout -f master", ""),
       Cmd("gclient sync --nohooks", "syncing..."),
+      Cmd("git pull", ""),
       Cmd("git fetch origin", ""),
       Cmd("git checkout -b v8-roll-123455", ""),
       Cmd("roll-dep v8 123455", "rolled", cb=WriteDeps),