From d13b697792c7102d42ab3d221ce8fe60bf5ad10e Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Wed, 4 Apr 2012 14:12:28 -0400
Subject: [PATCH] Simplify Git submodule ignore settings

---
 modules/git/functions/git-info | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/modules/git/functions/git-info b/modules/git/functions/git-info
index 0045bf2..86d55b1 100644
--- a/modules/git/functions/git-info
+++ b/modules/git/functions/git-info
@@ -58,11 +58,8 @@
 #     # Right prompt.
 #     zstyle ':omz:module:git' rprompt ''
 #
-#     # Ignore submodule.
-#     zstyle ':omz:module:git:ignore' submodule 'no'
-#
 #     # Ignore submodule when it is 'dirty', 'untracked', 'all', or 'none'.
-#     zstyle ':omz:module:git:ignore:submodule' when 'all'
+#     zstyle ':omz:module:git:ignore' submodule ''
 #
 
 # Gets the path to the Git directory.
@@ -197,7 +194,6 @@ function git-info {
   local dirty_format
   local dirty_formatted
   local ignore_submodule
-  local ignore_submodule_when
   local line_number=0
   local modified=0
   local modified_format
@@ -265,12 +261,9 @@ function git-info {
   ahead_and_behind_cmd='git rev-list --count --left-right HEAD...@{upstream}'
 
   # Ignore submodule status.
-  zstyle -b \
-    ':omz:module:git:ignore' submodule 'ignore_submodule'
-  zstyle -s \
-    ':omz:module:git:ignore:submodule' when 'ignore_submodule_when'
-  if is-true "$ignore_submodule"; then
-    status_cmd+=" --ignore-submodules=${ignore_submodule_when:-all}"
+  zstyle -s ':omz:module:git:ignore' submodule 'ignore_submodule'
+  if [[ -n "$ignore_submodule" ]]; then
+    status_cmd+=" --ignore-submodules=${ignore_submodule}"
   fi
 
   # Format commit.