commit e84b7541ce1bb3d5867fd3de48e446c979af4c01
author szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jun 15 21:26:58 2012 +0000
committer szager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jun 15 21:26:58 2012 +0000
tree 69670103da104a6735f85dc55048247609abe8af
parent 79245bf5530ea212573862d1b1a263b0c9894765

Add test for git-svn with submodule/merge layout.

Review URL: https://chromiumcodereview.appspot.com/10543151

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@142479 0039d316-1c4b-4281-b951-d872f2087c98

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 6f4d1b9..5bd6d1b 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1145,7 +1145,7 @@
   # When submodules are added to the repo, we expect there to be a single
   # non-git-svn merge commit at remote HEAD with a signature comment.
   pattern = '^SVN changes up to revision [0-9]*$'
-  cmd = ['rev-list', '--merges', '--grep="%s"' % pattern, '%s^!' % ref]
+  cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref]
   return RunGit(cmd) != ''