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

fixes #3221 : correct parsing of git status : some config does not have leading # in git status

Browse source
This commit is contained in:
Augustin Trancart 2014-09-25 23:19:32 +02:00
commit 72df3df26a
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'^(?:# )?Changes not staged for commit:$', 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):