1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-25 15:20:08 +00:00

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

Commit 81004dfaba reverted the change
in 9b811fb625 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
This commit is contained in:
Marc Cornellà 2014-11-19 18:33:00 +01:00
parent df5b09e20b
commit a301f567e3

View file

@ -13,7 +13,7 @@ parse_git_dirty() {
local STATUS='' local STATUS=''
local FLAGS local FLAGS
FLAGS=('--porcelain') FLAGS=('--porcelain')
if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
if [[ $POST_1_7_2_GIT -gt 0 ]]; then if [[ $POST_1_7_2_GIT -gt 0 ]]; then
FLAGS+='--ignore-submodules=dirty' FLAGS+='--ignore-submodules=dirty'
fi fi