X-Git-Url: https://git.alrj.org/?p=zsh.d.git;a=blobdiff_plain;f=S60_git;h=1061cf575a0a04d47412070ac157bdf7cc2b71fa;hp=78c163c7b8d9d48a3e70dc32501186a134163595;hb=HEAD;hpb=d5fa159d3b0bcf2e4c2dc3b812dea053d2e61929 diff --git a/S60_git b/S60_git index 78c163c..1061cf5 100644 --- a/S60_git +++ b/S60_git @@ -34,20 +34,20 @@ git_get_status() { # Return only git status local gitstat gitstatus - gitstat=$(git status 2> /dev/null | grep '\(# Untracked\|# Changes\|# Changed but not updated:\)') + gitstat=$(LANG=C git status 2> /dev/null | grep '\(Untracked\|Changes\|Changed but not updated:\)') # 'fix for mcedit parser gitstatus="" - if [[ $(echo ${gitstat} | grep -c "^# Changes to be committed:$") > 0 ]]; then + if [[ $(echo ${gitstat} | grep -c "^Changes to be committed:$") > 0 ]]; then gitstatus='✚' fi - if [[ $(echo ${gitstat} | grep -c "^\# Changed but not updated:$") > 0 || \ - $(echo ${gitstat} | grep -c "^\# Changes not staged for commit:$") > 0 ]]; then + if [[ $(echo ${gitstat} | grep -c "^Changed but not updated:$") > 0 || \ + $(echo ${gitstat} | grep -c "^Changes not staged for commit:$") > 0 ]]; then gitstatus="${gitstatus}✹" fi - if [[ $(echo ${gitstat} | grep -c "^# Untracked files:$") > 0 ]]; then + if [[ $(echo ${gitstat} | grep -c "^Untracked files:$") > 0 ]]; then gitstatus="${gitstatus}★" fi