fix for issue lvv#37 (branch detection with new git)

archon810 · Dec 10, 2013 · eeff805 · eeff805
1 parent 00a94f5
commit eeff805
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/git-prompt.sh b/git-prompt.sh
@@ -433,12 +433,12 @@ parse_git_status() {
         eval " $(
                 git status 2>/dev/null |
                     sed -n '
-                        s/^# On branch /branch=/p
+                        s/^\(# \)*On branch /branch=/p
                         s/^nothing to commi.*/clean=clean/p
-                        s/^# Initial commi.*/init=init/p
-                        s/^# Your branch is ahead of \(.\).\+\1 by [[:digit:]]\+ commit.*/freshness=${WHITE}↑/p
-                        s/^# Your branch is behind \(.\).\+\1 by [[:digit:]]\+ commit.*/freshness=${YELLOW}↓/p
-                        s/^# Your branch and \(.\).\+\1 have diverged.*/freshness=${YELLOW}↕/p
+                        s/^\(# \)*Initial commi.*/init=init/p
+                        s/^\(# \)*Your branch is ahead of \(.\).\+\1 by [[:digit:]]\+ commit.*/freshness=${WHITE}↑/p
+                        s/^\(# \)*Your branch is behind \(.\).\+\1 by [[:digit:]]\+ commit.*/freshness=${YELLOW}↓/p
+                        s/^\(# \)*Your branch and \(.\).\+\1 have diverged.*/freshness=${YELLOW}↕/p
                     '
         )"