1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-22 12:20:07 +00:00

Merge commit 'd047ed87a1093b27aff3324ba57860c9c42f7b65'

This commit is contained in:
romkatv 2020-05-11 15:29:08 +02:00
commit 1a976f989a
2 changed files with 4 additions and 4 deletions

View file

@ -8,7 +8,7 @@
# Usage: gitstatus_start [OPTION]... # Usage: gitstatus_start [OPTION]...
# #
# -t FLOAT Fail the self-check on initialization if not getting a response from # -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. # -s INT Report at most this many staged changes; negative value means infinity.
# Defaults to 1. # Defaults to 1.
@ -37,7 +37,7 @@
# changes for repositories with bash.showDirtyState = false. # changes for repositories with bash.showDirtyState = false.
function gitstatus_start() { function gitstatus_start() {
unset OPTIND 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 max_num_staged=1 max_num_unstaged=1 max_num_conflicted=1 max_num_untracked=1
local ignore_status_show_untracked_files local ignore_status_show_untracked_files
while getopts "t:s:u:c:d:m:eUWD" opt; do while getopts "t:s:u:c:d:m:eUWD" opt; do

View file

@ -445,7 +445,7 @@ function _gitstatus_daemon"${1:-}"() {
# Usage: gitstatus_start [OPTION]... NAME # Usage: gitstatus_start [OPTION]... NAME
# #
# -t FLOAT Fail the self-check on initialization if not getting a response from gitstatusd for # -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. # -s INT Report at most this many staged changes; negative value means infinity.
# Defaults to 1. # Defaults to 1.
@ -480,7 +480,7 @@ function gitstatus_start"${1:-}"() {
local opt OPTARG local opt OPTARG
local -i OPTIND local -i OPTIND
local -F timeout=5 local -F timeout=30
local -i async=0 local -i async=0
local -a args=() local -a args=()
local -i dirty_max_index_size=-1 local -i dirty_max_index_size=-1