linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-20 03:02:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Respect all git versions

Browse source 
git 2 doesn't use `# `
This commit is contained in:
Nico Revin 2014-07-02 16:41:35 +04:00
commit 5c325f84d5
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/git-prompt/gitstatus.py
View file

@ -24,14 +24,14 @@ if error:
lines = output.splitlines() lines = output.splitlines()
behead_re = re.compile( behead_re = re.compile(
r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit") r"^(?:# |)Your branch is (ahead of|behind) '(.*)' by (\d+) commit")
diverge_re = re.compile(r"^# and have (\d+) and (\d+) different") diverge_re = re.compile(r"^(?:# |)and have (\d+) and (\d+) different")
status = '' status = ''
staged = re.compile(r'^# Changes to be committed:$', re.MULTILINE) staged = re.compile(r'^(?:# |)Changes to be committed:$', re.MULTILINE)
changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE) changed = re.compile(r'^(?:# |)Changed but not updated:$', re.MULTILINE)
untracked = re.compile(r'^# Untracked files:$', re.MULTILINE) untracked = re.compile(r'^(?:# |)Untracked files:$', re.MULTILINE)
unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE) unmerged = re.compile(r'^(?:# |)Unmerged paths:$', re.MULTILINE)
def execute(*command): def execute(*command):