From 5c325f84d531fbae7c1a8c14c3278e314af1f0d5 Mon Sep 17 00:00:00 2001 From: Nico Revin Date: Wed, 2 Jul 2014 16:41:35 +0400 Subject: [PATCH] Respect all git versions git 2 doesn't use `# ` --- plugins/git-prompt/gitstatus.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py index c665a9ee1..bd1d01166 100644 --- a/plugins/git-prompt/gitstatus.py +++ b/plugins/git-prompt/gitstatus.py @@ -24,14 +24,14 @@ if error: lines = output.splitlines() behead_re = re.compile( - r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit") -diverge_re = re.compile(r"^# and have (\d+) and (\d+) different") + r"^(?:# |)Your branch is (ahead of|behind) '(.*)' by (\d+) commit") +diverge_re = re.compile(r"^(?:# |)and have (\d+) and (\d+) different") status = '' -staged = re.compile(r'^# Changes to be committed:$', re.MULTILINE) -changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE) -untracked = re.compile(r'^# Untracked files:$', re.MULTILINE) -unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE) +staged = re.compile(r'^(?:# |)Changes to be committed:$', re.MULTILINE) +changed = re.compile(r'^(?:# |)Changed but not updated:$', re.MULTILINE) +untracked = re.compile(r'^(?:# |)Untracked files:$', re.MULTILINE) +unmerged = re.compile(r'^(?:# |)Unmerged paths:$', re.MULTILINE) def execute(*command):