Fix submodule-merge-test.

tests/test-lib.sh

 #!/usr/bin/env bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Abort on error.
 set -e
 
 export DEPOT_TOOLS_UPDATE=0
@@ skipping 54 matching lines @@
   rm -rf git-svn-submodule
   git svn -q clone -s $REPO_URL git-svn-submodule >/dev/null 2>&1
   svn_revision=`svn info file://$PWD/svnrepo | grep ^Revision | \
                 sed s/^.*:// | xargs`
   (
     cd git-svn-submodule
     git config user.name 'TestDood'
     git config user.email 'TestDood@example.com'
     echo 'merge-file line 1' > merge-file
     git add merge-file; git commit -q -m 'First non-svn commit on master'
-    git checkout -q refs/remotes/trunk
+    git checkout -q refs/remotes/origin/trunk
     git merge -q --no-commit --no-ff refs/heads/master >/dev/null 2>&1
     echo 'merge-edit-file line 1' > merge-edit-file
     git add merge-edit-file
     git commit -q -m "SVN changes up to revision $svn_revision"
     git update-ref refs/heads/master HEAD
     git checkout master
   )
 }
 
 # Set up a git repo that has a few commits to master.
@@ skipping 55 matching lines @@
     return $exit_code
   fi
 }
 
 # Grab the XSRF token from the review server and print it to stdout.
 print_xsrf_token() {
   curl --cookie dev_appserver_login="test@example.com:False" \
     --header 'X-Requesting-XSRF-Token: 1' \
     http://localhost:10000/xsrf_token 2>/dev/null
 }