PRESUBMIT.py - Issue 12079003: Update presubmit branch check text for git 1.8

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

Issue 12079003: Update presubmit branch check text for git 1.8 (Closed) Base URL: http://git.chromium.org/native_client/pnacl-llvm.git@master

Patch Set: Created 7 years, 11 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: PRESUBMIT.py

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

index af60ae4f1efcd4be17ebe199fd8bbcb5956861bf..d81168ea093e686303f8e98984ffae2bee24308e 100644

--- a/PRESUBMIT.py

+++ b/PRESUBMIT.py

@@ -24,7 +24,7 @@ def CheckGitBranch():

warning = 'Warning: your current branch:\n' + line

warning += '\nis not tracking origin/master. git cl push may silently '

warning += 'fail to push your change. To fix this, do\n'

- warning += 'git branch --set-upstream '+ toks[1] + ' origin/master'

+ warning += 'git branch -u origin/master'

return warning

return None

print 'Warning: presubmit check could not determine local git branch'

« no previous file with comments | « no previous file | no next file » | no next file with comments »