diff options
| author | Robby Russell <robby@planetargon.com> | 2013-05-23 07:58:50 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-05-23 07:58:50 -0700 |
| commit | 79196f82130a97f8b6226f601c2f3424cf16e064 (patch) | |
| tree | a48e1a0f8c022922de09b3c74a86bb739580fe3b | |
| parent | 007853847875e92cfbcabe90f0c4d6228a6cc35d (diff) | |
| parent | 4ff861ee115fdba24033f945dcf3cacea3120074 (diff) | |
| download | zsh-79196f82130a97f8b6226f601c2f3424cf16e064.tar.gz zsh-79196f82130a97f8b6226f601c2f3424cf16e064.tar.bz2 zsh-79196f82130a97f8b6226f601c2f3424cf16e064.zip | |
Merge pull request #1834 from croach/disable_untracked_files_dirty_fix
Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
| -rw-r--r-- | lib/git.zsh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 96598cf5f..c4b5b5d62 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -15,12 +15,12 @@ parse_git_dirty() { if [[ $POST_1_7_2_GIT -gt 0 ]]; then SUBMODULE_SYNTAX="--ignore-submodules=dirty" fi - if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then - GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1) - else + if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1) + else + GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1) fi - if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null) ]]; then + if [[ -n $GIT_STATUS ]]; then echo "$ZSH_THEME_GIT_PROMPT_DIRTY" else echo "$ZSH_THEME_GIT_PROMPT_CLEAN" |