gclient_scm.py - Issue 2087015: When branch is not correctly set, it would throw an exception.

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 2087015: When branch is not correctly set, it would throw an exception. (Closed)

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

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

index 3a0b5371ce68198bd32483c4d0a9406952e14819..fb2ec28d745f14153f7bf20628ff6f73abe7519e 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -574,6 +574,8 @@ class GitWrapper(SCMWrapper):

# Returns name of current branch

# Returns None if inside a (no branch)

tokens = self._Run(['branch']).split()

+ if not '*' in tokens:

+ return None

branch = tokens[tokens.index('*') + 1]

if branch == '(no':

return None

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