From 69253953f9d5facb194224743202772d0306b5da Mon Sep 17 00:00:00 2001
From: romkatv <roman.perepelitsa@gmail.com>
Date: Sat, 30 Mar 2019 15:40:49 +0100
Subject: pull upstream changes from gitstatus
---
gitstatus/bin/gitstatusd-darwin-x86_64 | Bin 974396 -> 1026656 bytes
gitstatus/bin/gitstatusd-freebsd-amd64 | Bin 2895656 -> 2953160 bytes
gitstatus/bin/gitstatusd-linux-armv7l | Bin 1721880 -> 1746492 bytes
gitstatus/bin/gitstatusd-linux-x86_64 | Bin 2131216 -> 2168080 bytes
gitstatus/gitstatus.plugin.zsh | 8 ++++----
5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitstatus/bin/gitstatusd-darwin-x86_64 b/gitstatus/bin/gitstatusd-darwin-x86_64
index 9fa985f2..694695bc 100755
Binary files a/gitstatus/bin/gitstatusd-darwin-x86_64 and b/gitstatus/bin/gitstatusd-darwin-x86_64 differ
diff --git a/gitstatus/bin/gitstatusd-freebsd-amd64 b/gitstatus/bin/gitstatusd-freebsd-amd64
index fc588c23..b89a0c8c 100755
Binary files a/gitstatus/bin/gitstatusd-freebsd-amd64 and b/gitstatus/bin/gitstatusd-freebsd-amd64 differ
diff --git a/gitstatus/bin/gitstatusd-linux-armv7l b/gitstatus/bin/gitstatusd-linux-armv7l
index 9ea3dc08..06152472 100755
Binary files a/gitstatus/bin/gitstatusd-linux-armv7l and b/gitstatus/bin/gitstatusd-linux-armv7l differ
diff --git a/gitstatus/bin/gitstatusd-linux-x86_64 b/gitstatus/bin/gitstatusd-linux-x86_64
index 6fd9c452..a2604da4 100755
Binary files a/gitstatus/bin/gitstatusd-linux-x86_64 and b/gitstatus/bin/gitstatusd-linux-x86_64 differ
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh
index aa95e408..7ff1a43b 100644
--- a/gitstatus/gitstatus.plugin.zsh
+++ b/gitstatus/gitstatus.plugin.zsh
@@ -3,7 +3,7 @@
# Retrives status of a git repo from a directory under its working tree.
#
-# -d STR Directory to query. Defaults to $PWD. Must be absolute.
+# -d STR Directory to query. Defaults to ${${GIT_DIR:-$PWD}:a}. Must be absolute.
# -c STR Callback function to call once the results are available. Called only after
# gitstatus_query returns 0 with VCS_STATUS_RESULT=tout.
# -t FLOAT Timeout in seconds. Will block for at most this long. If no results are
@@ -58,7 +58,7 @@ function gitstatus_query() {
setopt err_return no_unset
local opt
- local dir=$PWD
+ local dir=${${GIT_DIR:-$PWD}:a}
local callback=''
local -F timeout=-1
while true; do
@@ -215,8 +215,8 @@ function gitstatus_start() {
local -i threads=${GITSTATUS_NUM_THREADS:-0}
(( threads > 0)) || {
case $os in
- FreeBSD) threads=$(sysctl -n hw.ncpu);;
- *) threads=$(getconf _NPROCESSORS_ONLN);;
+ FreeBSD) threads=$(( 2 * $(sysctl -n hw.ncpu) ));;
+ *) threads=$(( 2 * $(getconf _NPROCESSORS_ONLN) ));;
esac
}
--
cgit v1.2.3