git_cl.py - Issue 10543151: Add test for git-svn with submodule/merge layout.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_cl.py

Issue 10543151: Add test for git-svn with submodule/merge layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/

Patch Set: Invoke git subcommand with shell=False Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: git_cl.py

===================================================================

--- git_cl.py (revision 142106)

+++ git_cl.py (working copy)

@@ -1145,8 +1145,8 @@

# 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]

- return RunGit(cmd) != ''

+ cmd = ['rev-list', '--merges', '--grep', pattern, '%s^!' % ref]

+ return RunGit(cmd, shell=False) != ''

M-A Ruel 2012/06/15 18:26:58 Interesting, I sent a CL recently related to that,

def SendUpstream(parser, args, cmd):

« no previous file with comments | « no previous file | tests/abandon.sh » ('j') | no next file with comments »