From ba0e90d88737db6346d38c52b5e794c42caecca4 Mon Sep 17 00:00:00 2001 From: Ashley Dev Date: Thu, 2 Jun 2011 14:11:40 -0700 Subject: [PATCH] fix up the git prompt when it's a fresh repo --- plugins/git/git-prompt.plugin.zsh | 9 ++++----- themes/ashleydev.zsh-theme | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/plugins/git/git-prompt.plugin.zsh b/plugins/git/git-prompt.plugin.zsh index 5b575be6..e79749e7 100644 --- a/plugins/git/git-prompt.plugin.zsh +++ b/plugins/git/git-prompt.plugin.zsh @@ -148,13 +148,12 @@ # # local _prompt="$b$r$i$s$p" # # add ( ) around _prompt: -# if [ $f = 'yes' ]; then -# _prompt="($_prompt)" -# elif [ "$u" = "yes" ]; then +# if [ "$u" = "yes" ]; then # _prompt="$_Cu_dirty_($_prompt$_Cu_dirty_)" # elif [ "$u" = "no" ]; then # _prompt="$_Cu_clean_($_prompt$_Cu_clean_)" # else +# _prompt="($_prompt$)" # fi # # __GIT_PROMPT_INFO="$R$_prompt$R" @@ -539,11 +538,11 @@ _git_prompt__dirty_state () if [[ "$line" = \?\?* ]]; then GIT_PROMPT_DIRTY_STATE_WORKTREE_UNTRACKED='yes' fi - if [[ "$line" = \ M* ]]; then + if [[ "$line" = ?M* ]]; then GIT_PROMPT_DIRTY_STATE_WORKTREE_MODIFIED='yes' GIT_PROMPT_DIRTY_STATE_WORKTREE_DIRTY='yes' fi - if [[ "$line" = \ D* ]]; then + if [[ "$line" = ?D* ]]; then GIT_PROMPT_DIRTY_STATE_WORKTREE_DELETED='yes' GIT_PROMPT_DIRTY_STATE_WORKTREE_DIRTY='yes' fi diff --git a/themes/ashleydev.zsh-theme b/themes/ashleydev.zsh-theme index 2dcb8be8..30351a51 100644 --- a/themes/ashleydev.zsh-theme +++ b/themes/ashleydev.zsh-theme @@ -120,13 +120,12 @@ update__GIT_PROMPT_INFO () local _prompt="$b$r$i$s$p" # add ( ) around _prompt: - if [ "$f" = 'yes' ]; then - _prompt="($_prompt)" - elif [ "$u" = "yes" ]; then + if [ "$u" = "yes" ]; then _prompt="$_Cu_dirty_($_prompt$_Cu_dirty_)" elif [ "$u" = "no" ]; then _prompt="$_Cu_clean_($_prompt$_Cu_clean_)" else + _prompt="($_prompt$)" fi __GIT_PROMPT_INFO="$R$_prompt$R"