Add support for new repo topology, with submodule-specific merge commits
on origin/master.
Review URL: https://chromiumcodereview.appspot.com/10537117
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@141958 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 7c9eb42..fe4d54d 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -147,6 +147,9 @@
((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
((['git', 'config', 'branch.working.merge'],), 'refs/heads/master'),
((['git', 'config', 'branch.working.remote'],), 'origin'),
+ ((['git', 'rev-list', '--merges',
+ '--grep="^SVN changes up to revision [0-9]*$"',
+ 'refs/remotes/origin/master^!'],), ''),
((['git', 'update-index', '--refresh', '-q'],), ''),
((['git', 'diff-index', 'HEAD'],), ''),
((['git', 'rev-list', '^refs/heads/working',
@@ -198,6 +201,8 @@
'refs/heads/git-cl-commit'],),
(('', None), 0)),
((['git', 'branch', '-D', 'git-cl-commit'],), ''),
+ ((['git', 'show-ref', '--quiet', '--verify',
+ 'refs/heads/git-cl-cherry-pick'],), ''),
((['git', 'rev-parse', '--show-cdup'],), '\n'),
((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
((['git', 'reset', '--soft', 'refs/remotes/origin/master'],), ''),