summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmir Yalon <git@please.nospammail.net>2014-06-05 18:31:47 +0300
committerGianni Ceccarelli <gianni.ceccarelli@net-a-porter.com>2014-06-10 14:50:44 +0100
commit1b15d1af7767de046f9f104dc0325f17afb74b36 (patch)
tree57385f3fdff3a09fd3e3e9da2420632ef4bee619
parentMerge remote-tracking branch 'origin/master' into dakkar (diff)
downloadgit-prompt-1b15d1af7767de046f9f104dc0325f17afb74b36.tar.gz
git-prompt-1b15d1af7767de046f9f104dc0325f17afb74b36.tar.bz2
git-prompt-1b15d1af7767de046f9f104dc0325f17afb74b36.zip
Remove back references in freshness detection code
Correct fix for issue #37
-rwxr-xr-xgit-prompt.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-prompt.sh b/git-prompt.sh
index 1eed094..89996d8 100755
--- a/git-prompt.sh
+++ b/git-prompt.sh
@@ -452,9 +452,9 @@ parse_git_status() {
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/^\(# \)*Your branch is ahead of ..\+. by [[:digit:]]\+ commit.*/freshness=${WHITE}↑/p
+ s/^\(# \)*Your branch is behind ..\+. by [[:digit:]]\+ commit.*/freshness=${YELLOW}↓/p
+ s/^\(# \)*Your branch and ..\+. have diverged.*/freshness=${YELLOW}↕/p
'
)"