From cb341924223d9195e9c0172204b0764a0f9fcb4c Mon Sep 17 00:00:00 2001 From: quiwamu Date: Thu, 4 Oct 2012 11:24:14 +0900 Subject: [PATCH] modify git_prompt_status modified test expression because $(echo | grep foo) returns 'true' in some zsh ( for example 4.2.6 ) --- lib/git.zsh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/git.zsh b/lib/git.zsh index fb4ad8ca6..a364e7524 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -40,30 +40,30 @@ function git_prompt_long_sha() { git_prompt_status() { INDEX=$(git status --porcelain 2> /dev/null) STATUS="" - if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then + if echo "$INDEX" | grep '^?? ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS" fi - if $(echo "$INDEX" | grep '^A ' &> /dev/null); then + if echo "$INDEX" | grep '^A ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" - elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then + elif echo "$INDEX" | grep '^M ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" fi - if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then + if echo "$INDEX" | grep '^ M ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" - elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then + elif echo "$INDEX" | grep '^AM ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" - elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then + elif echo "$INDEX" | grep '^ T ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" fi - if $(echo "$INDEX" | grep '^R ' &> /dev/null); then + if echo "$INDEX" | grep '^R ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS" fi - if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then + if echo "$INDEX" | grep '^ D ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" - elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then + elif echo "$INDEX" | grep '^AD ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" fi - if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then + if echo "$INDEX" | grep '^UU ' &> /dev/null; then STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" fi echo $STATUS