perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config file
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Feb 25, 2018 at 14:18 UTC
53ba2c799a880316330da7520b6b517a4f6acf5e
1 file changed
+3
-5
t/perf/run
+3
-5
@@ -106,7 +106,6 @@ get_var_from_env_or_config () {
106
conf_sec="$2"
107
conf_var="$3"
108
conf_opts="$4" # optional
109
- # $5 can be set to a default value
109
110
# Do nothing if the env variable is already set
111
eval "test -z \"\${$env_var+x}\"" || return
@@ -122,13 +121,12 @@ get_var_from_env_or_config () {
121
fi
122
var="$conf_sec.$conf_var"
123
conf_value=$(git config $conf_opts -f "$GIT_PERF_CONFIG_FILE" "$var") &&
125
- eval "$env_var=\"$conf_value\"" && return
126
-
127
- test -n "${5+x}" && eval "$env_var=\"$5\""
124
+ eval "$env_var=\"$conf_value\""
125
}
126
127
run_subsection () {
131
- get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" "--int" 3
128
+ get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" "--int"
129
+ : ${GIT_PERF_REPEAT_COUNT:=3}
130
export GIT_PERF_REPEAT_COUNT
131
132
get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf" "dirsOrRevs"