79196f82130a97f8b6226f601c2f3424cf16e064
- Author
- Robby Russell <robby@planetargon.com>
- Committer
- Robby Russell <robby@planetargon.com>
- Date
Message
Merge pull request #1834 from croach/disable_untracked_files_dirty_fix
Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
Diff
1diff --git a/lib/git.zsh b/lib/git.zsh
2index 96598cf5f9c6bd4e6a1c301eaee823cc87f51582..c4b5b5d62e71dfdd218b3ee97b2b1798bae11736 100644
3--- a/lib/git.zsh
4+++ b/lib/git.zsh
5@@ -15,12 +15,12 @@ parse_git_dirty() {
6 if [[ $POST_1_7_2_GIT -gt 0 ]]; then
7 SUBMODULE_SYNTAX="--ignore-submodules=dirty"
8 fi
9- if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" != "true" ]]; then
10- GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
11- else
12+ if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
13 GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
14+ else
15+ GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} 2> /dev/null | tail -n1)
16 fi
17- if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null) ]]; then
18+ if [[ -n $GIT_STATUS ]]; then
19 echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
20 else
21 echo "$ZSH_THEME_GIT_PROMPT_CLEAN"