pull upstream changes from gitstatus

9 files changed, 8 insertions, 2 deletions

diff --git a/gitstatus/bin/gitstatusd-android-aarch64 b/gitstatus/bin/gitstatusd-android-aarch64
index 3da517d3..e9b22e72 100755
--- a/gitstatus/bin/gitstatusd-android-aarch64
+++ b/gitstatus/bin/gitstatusd-android-aarch64
diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64
index 51a1f0a0..a1baa948 100755
--- a/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64
+++ b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64
diff --git a/gitstatus/bin/gitstatusd-darwin-x86_64 b/gitstatus/bin/gitstatusd-darwin-x86_64
index 31eb9db3..e5c46cc2 100755
--- a/gitstatus/bin/gitstatusd-darwin-x86_64
+++ b/gitstatus/bin/gitstatusd-darwin-x86_64
diff --git a/gitstatus/bin/gitstatusd-freebsd-amd64 b/gitstatus/bin/gitstatusd-freebsd-amd64
index 7a39061a..de7e0f24 100755
--- a/gitstatus/bin/gitstatusd-freebsd-amd64
+++ b/gitstatus/bin/gitstatusd-freebsd-amd64
diff --git a/gitstatus/bin/gitstatusd-linux-aarch64 b/gitstatus/bin/gitstatusd-linux-aarch64
index ebae869a..b99ecfee 100755
--- a/gitstatus/bin/gitstatusd-linux-aarch64
+++ b/gitstatus/bin/gitstatusd-linux-aarch64
diff --git a/gitstatus/bin/gitstatusd-linux-armv7l b/gitstatus/bin/gitstatusd-linux-armv7l
index 89b59a74..3d301aa9 100755
--- a/gitstatus/bin/gitstatusd-linux-armv7l
+++ b/gitstatus/bin/gitstatusd-linux-armv7l
diff --git a/gitstatus/bin/gitstatusd-linux-x86_64 b/gitstatus/bin/gitstatusd-linux-x86_64
index 802f71ac..e81bb09a 100755
--- a/gitstatus/bin/gitstatusd-linux-x86_64
+++ b/gitstatus/bin/gitstatusd-linux-x86_64
diff --git a/gitstatus/bin/gitstatusd-linux-x86_64-static b/gitstatus/bin/gitstatusd-linux-x86_64-static
index 8eee5b55..b561edd9 100755
--- a/gitstatus/bin/gitstatusd-linux-x86_64-static
+++ b/gitstatus/bin/gitstatusd-linux-x86_64-static
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh
index 7faa196c..244c34e5 100644
--- a/gitstatus/gitstatus.plugin.zsh
+++ b/gitstatus/gitstatus.plugin.zsh
@@ -264,6 +264,8 @@ function _gitstatus_process_response() {
 #
 #   -m INT    If a repo has more files in its index than this, override -u and -d (but not -s)
 #             with zeros. Negative value means infinity. Defaults to -1.
+#
+#   -e        Count files within untracked directories like `git status --untracked-files`.
 function gitstatus_start() {
   emulate -L zsh
   setopt err_return no_unset no_bg_nice
@@ -275,8 +277,9 @@ function gitstatus_start() {
   local -i max_num_conflicted=1
   local -i max_num_untracked=1
   local -i dirty_max_index_size=-1
+  local recurse_untracked_dirs
   while true; do
-    getopts "t:s:u:c:d:m:" opt || break
+    getopts "t:s:u:c:d:m:e" opt || break
     case $opt in
       t) timeout=$OPTARG;;
       s) max_num_staged=$OPTARG;;
@@ -284,6 +287,8 @@ function gitstatus_start() {
       c) max_num_conflicted=$OPTARG;;
       d) max_num_untracked=$OPTARG;;
       m) dirty_max_index_size=$OPTARG;;
+      e) recurse_untracked_dirs='--recurse-untracked-dirs';;
+      +e) recurse_untracked_dirs=;;
       ?) return 1;;
     esac
   done
@@ -349,7 +354,8 @@ function gitstatus_start() {
       --max-num-conflicted=${(q)max_num_conflicted}
       --max-num-untracked=${(q)max_num_untracked}
       --dirty-max-index-size=${(q)dirty_max_index_size}
-      ${${log_level:#INFO}:+--log-level=$log_level})
+      --log-level=${(q)log_level}
+      $recurse_untracked_dirs)
 
     local cmd="
       echo \$\$