[PATCH] perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config file
- From
René Scharfe <l.s.r@web.de>
- Date
- Feb 25, 2018, 13:18 UTC
- Message-ID
- <d80b51db-a746-e526-5005-141504f087bc@web.de>
9ba95ed23c (perf/run: update get_var_from_env_or_config() for subsections) stopped setting a default value for GIT_PERF_REPEAT_COUNT if no perf config file is present, because get_var_from_env_or_config returns early in that case.
Fix it by setting the default value after calling this function. Its fifth parameter is not used for any other variable, so remove the associated code.
Signed-off-by: Rene Scharfe <l.s.r@web.de> --- t/perf/run | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/t/perf/run b/t/perf/run index 1a100d6134..213da5d6b9 100755 --- a/t/perf/run +++ b/t/perf/run @@ -106,29 +106,27 @@ get_var_from_env_or_config () { conf_sec="$2" conf_var="$3" conf_opts="$4" # optional - # $5 can be set to a default value # Do nothing if the env variable is already set eval "test -z \"\${$env_var+x}\"" || return test -z "$GIT_PERF_CONFIG_FILE" && return # Check if the variable is in the config file if test -n "$GIT_PERF_SUBSECTION" then var="$conf_sec.$GIT_PERF_SUBSECTION.$conf_var" conf_value=$(git config $conf_opts -f "$GIT_PERF_CONFIG_FILE" "$var") && eval "$env_var=\"$conf_value\"" && return fi var="$conf_sec.$conf_var" conf_value=$(git config $conf_opts -f "$GIT_PERF_CONFIG_FILE" "$var") && - eval "$env_var=\"$conf_value\"" && return - - test -n "${5+x}" && eval "$env_var=\"$5\"" + eval "$env_var=\"$conf_value\"" } run_subsection () { - get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" "--int" 3 + get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" "--int" + : ${GIT_PERF_REPEAT_COUNT:=3} export GIT_PERF_REPEAT_COUNT get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf" "dirsOrRevs"
-- 2.16.2