aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorromkatv <roman.perepelitsa@gmail.com>2020-05-11 16:29:08 +0300
committerromkatv <roman.perepelitsa@gmail.com>2020-05-11 16:29:08 +0300
commit1a976f989a7b9ace28ec72a57eb570850088ab8e (patch)
tree2ad0fff39c380c45e4efd42e6c89b8835999abb3
parent75bbc4439fba7be0e72ab4c17e4aca62d03fc9c6 (diff)
parentd047ed87a1093b27aff3324ba57860c9c42f7b65 (diff)
Merge commit 'd047ed87a1093b27aff3324ba57860c9c42f7b65'v1.8.1
-rw-r--r--gitstatus/gitstatus.plugin.sh4
-rw-r--r--gitstatus/gitstatus.plugin.zsh4
2 files changed, 4 insertions, 4 deletions
diff --git a/gitstatus/gitstatus.plugin.sh b/gitstatus/gitstatus.plugin.sh
index 7385defa..75bc2688 100644
--- a/gitstatus/gitstatus.plugin.sh
+++ b/gitstatus/gitstatus.plugin.sh
@@ -8,7 +8,7 @@
# Usage: gitstatus_start [OPTION]...
#
# -t FLOAT Fail the self-check on initialization if not getting a response from
-# gitstatusd for this this many seconds. Defaults to 5.
+# gitstatusd for this this many seconds. Defaults to 30.
#
# -s INT Report at most this many staged changes; negative value means infinity.
# Defaults to 1.
@@ -37,7 +37,7 @@
# changes for repositories with bash.showDirtyState = false.
function gitstatus_start() {
unset OPTIND
- local opt timeout=5 max_dirty=-1 extra_flags
+ local opt timeout=30 max_dirty=-1 extra_flags
local max_num_staged=1 max_num_unstaged=1 max_num_conflicted=1 max_num_untracked=1
local ignore_status_show_untracked_files
while getopts "t:s:u:c:d:m:eUWD" opt; do
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh
index 5dc8d737..d1d74469 100644
--- a/gitstatus/gitstatus.plugin.zsh
+++ b/gitstatus/gitstatus.plugin.zsh
@@ -445,7 +445,7 @@ function _gitstatus_daemon"${1:-}"() {
# Usage: gitstatus_start [OPTION]... NAME
#
# -t FLOAT Fail the self-check on initialization if not getting a response from gitstatusd for
-# this this many seconds. Defaults to 5.
+# this this many seconds. Defaults to 30.
#
# -s INT Report at most this many staged changes; negative value means infinity.
# Defaults to 1.
@@ -480,7 +480,7 @@ function gitstatus_start"${1:-}"() {
local opt OPTARG
local -i OPTIND
- local -F timeout=5
+ local -F timeout=30
local -i async=0
local -a args=()
local -i dirty_max_index_size=-1