git_cl.py - Issue 811023003: Added error check that we are on a branch when we try to upload.

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 811023003: Added error check that we are on a branch when we try to upload. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Unintentional whitespace change Created 6 years 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: git_cl.py

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

index c881729c05c7b5763b3695997c51485102228b98..4c91b6c762147b7ce5c886df94d8fdd906995725 100755

--- a/git_cl.py

+++ b/git_cl.py

@@ -1866,6 +1866,9 @@ def CMDupload(parser, args):

# TODO(ukai): is it ok for gerrit case?

base_branch = args[0]

else:

+ if cl.GetBranch() is None:

+ DieWithError('Can\'t upload from detached HEAD state. Get on a branch!')

# Default to diffing against common ancestor of upstream branch

base_branch = cl.GetCommonAncestorWithUpstream()

args = [base_branch, 'HEAD']

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