a301f567e3a7ac2eb0b1f77d6ff97f50d63ba864

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

Switch back to oh-my-zsh.hide-dirty setting again

Commit 81004dfaba509ff62a13ba303ab941938d619326 reverted the change
in 9b811fb625c03c30a766191cdf65a1c7c1fd96b2 when editing the merge
conflict from #2928.

This commit fixes that so that we don't make the same mistake again.

First seen in http://git.io/Cdaj5Q

Diff

 1diff --git a/lib/git.zsh b/lib/git.zsh
 2index aba0954222f66c8fafae0f3f3149a36e3a6297e2..748520a6fa3dd2a48de8b3b619dec8a0f73abd26 100644
 3--- a/lib/git.zsh
 4+++ b/lib/git.zsh
 5@@ -13,7 +13,7 @@ parse_git_dirty() {
 6   local STATUS=''
 7   local FLAGS
 8   FLAGS=('--porcelain')
 9-  if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
10+  if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
11     if [[ $POST_1_7_2_GIT -gt 0 ]]; then
12       FLAGS+='--ignore-submodules=dirty'
13     fi