diff options
| author | Robby Russell <robby@planetargon.com> | 2013-04-22 19:08:55 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-04-22 19:08:55 -0700 |
| commit | 93ee93938337db6bc220eaa00595b40ad88c2a81 (patch) | |
| tree | 7f2177c9b7aea3a7d1e170dc5bcfedc46a404ffb | |
| parent | 5f32c8e1556685715555b362871515a43b13b2dc (diff) | |
| parent | e41714d72c6c5629efe632b1052b590f5f8905c5 (diff) | |
| download | zsh-93ee93938337db6bc220eaa00595b40ad88c2a81.tar.gz zsh-93ee93938337db6bc220eaa00595b40ad88c2a81.tar.bz2 zsh-93ee93938337db6bc220eaa00595b40ad88c2a81.zip | |
Merge pull request #1745 from jtheoof/master
Added option to allow untracked files as non dirty
| -rw-r--r-- | lib/git.zsh | 6 | ||||
| -rw-r--r-- | templates/zshrc.zsh-template | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 76fe9b142..5f8453112 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -15,7 +15,11 @@ parse_git_dirty() { if [[ $POST_1_7_2_GIT -gt 0 ]]; then SUBMODULE_SYNTAX="--ignore-submodules=dirty" fi - GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1) + if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then + GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1) + else + GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1) + fi if [[ -n $GIT_STATUS && "$GIT_STATUS" != "$CLEAN_MESSAGE" ]]; then echo "$ZSH_THEME_GIT_PROMPT_DIRTY" else diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 2ea9934af..58f193550 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -29,6 +29,11 @@ ZSH_THEME="robbyrussell" # Uncomment following line if you want red dots to be displayed while waiting for completion # COMPLETION_WAITING_DOTS="true" +# Uncomment following line if you want to disable marking untracked files under +# VCS as dirty. This makes repository status check for large repositories much, +# much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) |