From 7cc3a32bff9b283bf5eea139b92cbfddf3b75de5 Mon Sep 17 00:00:00 2001
From: Wang Guan <momocraft@gmail.com>
Date: Thu, 31 Oct 2013 05:46:27 +0900
Subject: Add an option about git submodules to ignore

$GIT_STATUS_IGNORE_SUBMODULES can be used to specify handling of
submodules. It can be:
not set : ignore dirty submodules (this was default zsh behavior)
"git"   : do not use "--ignore-submodules" and let git choose,
          this obeys setting in .gitmodules
other   : comes into "--ignore-submodules=$GIT_STATUS_IGNORE_SUBMODULES"
---
 lib/git.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'lib')

diff --git a/lib/git.zsh b/lib/git.zsh
index 640561e97..e8ef0d78d 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -17,6 +17,19 @@ function parse_git_dirty() {
     if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
       FLAGS+='--untracked-files=no'
     fi
+    case "$GIT_STATUS_IGNORE_SUBMODULES" in
+      "")
+        # if unset: ignore dirty submodules
+        FLAGS+="--ignore-submodules=dirty"
+        ;;
+      "git")
+        # let git decide (this respects per-repo config in .gitmodules)
+        ;;
+      *)
+        # other values are passed to --ignore-submodules
+        FLAGS+="--ignore-submodules=$GIT_STATUS_IGNORE_SUBMODULES"
+        ;;
+    esac
     STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1)
   fi
   if [[ -n $STATUS ]]; then
-- 
cgit v1.2.3-70-g09d2


From b7e37cea90b2bc718c66f90c0f9d52d1aa49ca79 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 6 Nov 2019 19:41:13 +0100
Subject: Clean up ignore submodules logic in parse_git_dirty

---
 lib/git.zsh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/git.zsh b/lib/git.zsh
index e8ef0d78d..7affdec68 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -18,16 +18,13 @@ function parse_git_dirty() {
       FLAGS+='--untracked-files=no'
     fi
     case "$GIT_STATUS_IGNORE_SUBMODULES" in
-      "")
-        # if unset: ignore dirty submodules
-        FLAGS+="--ignore-submodules=dirty"
-        ;;
-      "git")
+      git)
         # let git decide (this respects per-repo config in .gitmodules)
         ;;
       *)
+        # if unset: ignore dirty submodules
         # other values are passed to --ignore-submodules
-        FLAGS+="--ignore-submodules=$GIT_STATUS_IGNORE_SUBMODULES"
+        FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
         ;;
     esac
     STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1)
-- 
cgit v1.2.3-70-g09d2


From 1546e1226a7b739776bda43f264b221739ba0397 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 6 Nov 2019 19:46:52 +0100
Subject: Fix badly resolved rebase conflict

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/git.zsh b/lib/git.zsh
index 7affdec68..2054fe272 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -12,7 +12,7 @@ function git_prompt_info() {
 function parse_git_dirty() {
   local STATUS
   local -a FLAGS
-  FLAGS=('--porcelain' '--ignore-submodules=dirty')
+  FLAGS=('--porcelain')
   if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
     if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
       FLAGS+='--untracked-files=no'
-- 
cgit v1.2.3-70-g09d2