gclient_scm.py - Issue 7484002: Fix git-cl --contributor flag support for presubmit checks.

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: gclient_scm.py

Issue 7484002: Fix git-cl --contributor flag support for presubmit checks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Fixed whth --contributor is not used, duh Created 9 years, 5 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:

View side-by-side diff with in-line comments

Download patch

Index: gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py

index 83955c6973bfbb55a5935fc7a22bd82b285e3288..9881c074f2d572933a957afb332070f74ce649b8 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -355,8 +355,11 @@ class GitWrapper(SCMWrapper):

if verbose:

print('Trying fast-forward merge to branch : %s' % upstream_branch)

try:

- merge_output = scm.GIT.Capture(['merge', '--ff-only', upstream_branch],

- cwd=self.checkout_path)

+ merge_args = ['merge']

+ if not options.merge:

+ merge_args.append('--ff-only')

+ merge_args.append(upstream_branch)

+ merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)

except gclient_utils.CheckCallError, e:

if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):

if not printed_path:

« no previous file with comments | « gclient.py ('k') | git_cl.py » ('j') | no next file with comments »