commit 4d9da40423cba134aeaaccabf277d6aa4ce73385
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed May 19 17:12:31 2010 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed May 19 17:12:31 2010 +0000
tree 0038c6e61112ccbc86a66ba0bd94d7361cbf1725
parent 400f3e70909d3b96504ab7796121307905114d71

When branch is not correctly set, it would throw an exception.

Review URL: http://codereview.chromium.org/2087015

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@47678 0039d316-1c4b-4281-b951-d872f2087c98

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index 3a0b537..fb2ec28 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -574,6 +574,8 @@
     # 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