From d047ed87a1093b27aff3324ba57860c9c42f7b65 Mon Sep 17 00:00:00 2001 From: romkatv Date: Mon, 11 May 2020 15:29:08 +0200 Subject: [PATCH] Squashed 'gitstatus/' changes from 6a4f0fc0..cd5673b4 cd5673b4 increase default gitstatus_start timeout from 5s to 30s git-subtree-dir: gitstatus git-subtree-split: cd5673b4971bf1a6d9aa8d57963e954e619b950e --- gitstatus.plugin.sh | 4 ++-- gitstatus.plugin.zsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitstatus.plugin.sh b/gitstatus.plugin.sh index 7385defa..75bc2688 100644 --- a/gitstatus.plugin.sh +++ b/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.plugin.zsh b/gitstatus.plugin.zsh index 5dc8d737..d1d74469 100644 --- a/gitstatus.plugin.zsh +++ b/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