浏览代码

Parse branch-name for fresh repo (#6302)

Inside a fresh git repo, i.e. immediately after a `git init`, usually no
commit template exists yet. In this case, git renders a different
status message than "Initial commit on". We should consider this message
when attempting to parse out the branch name.

Fixes #6301
Oliver Baumann 7 年之前
父节点
当前提交
493c30954b
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      plugins/git-prompt/gitstatus.py

+ 1 - 1
plugins/git-prompt/gitstatus.py

@@ -41,7 +41,7 @@ ahead, behind = 0, 0
 status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()]
 for st in status:
     if st[0] == '#' and st[1] == '#':
-        if re.search('Initial commit on', st[2]):
+        if re.search('Initial commit on', st[2]) or re.search('No commits yet on', st[2]):
             branch = st[2].split(' ')[-1]
         elif re.search('no branch', st[2]):  # detached status
             branch = get_tagname_or_hash()