undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf/run: add conf_opts argument to get_var_from_env_or_config()

Browse Source 
Let's make it possible to use `git config` type specifiers like
`--int` or `--bool`, so that config values are converted to the
canonical form and easier to use.

This additional argument is now the fourth argument of
get_var_from_env_or_config() instead of the fifth because we
want the default value argument to be unset if it is not
passed, and this is simpler if it is the last argument.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2018-01-05 10:12:23 +01:00 committed by Junio C Hamano
parent 05eb1c37ed
commit 3ae7d2b0cd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
t/perf/run
View File

@ -105,7 +105,8 @@ get_var_from_env_or_config () {
env_var="$1" env_var="$1"
conf_sec="$2" conf_sec="$2"
conf_var="$3" conf_var="$3"
# $4 can be set to a default value conf_opts="$4" # optional
# $5 can be set to a default value
# Do nothing if the env variable is already set # Do nothing if the env variable is already set
eval "test -z \"\${$env_var+x}\"" || return eval "test -z \"\${$env_var+x}\"" || return
@ -116,18 +117,18 @@ get_var_from_env_or_config () {
if test -n "$GIT_PERF_SUBSECTION" if test -n "$GIT_PERF_SUBSECTION"
then then
var="$conf_sec.$GIT_PERF_SUBSECTION.$conf_var" var="$conf_sec.$GIT_PERF_SUBSECTION.$conf_var"
conf_value=$(git config -f "$GIT_PERF_CONFIG_FILE" "$var") && conf_value=$(git config $conf_opts -f "$GIT_PERF_CONFIG_FILE" "$var") &&
eval "$env_var=\"$conf_value\"" && return eval "$env_var=\"$conf_value\"" && return
fi fi
var="$conf_sec.$conf_var" var="$conf_sec.$conf_var"
conf_value=$(git config -f "$GIT_PERF_CONFIG_FILE" "$var") && conf_value=$(git config $conf_opts -f "$GIT_PERF_CONFIG_FILE" "$var") &&
eval "$env_var=\"$conf_value\"" && return eval "$env_var=\"$conf_value\"" && return
test -n "${4+x}" && eval "$env_var=\"$4\"" test -n "${5+x}" && eval "$env_var=\"$5\""
} }
run_subsection () { run_subsection () {
get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" 3 get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" "--int" 3
export GIT_PERF_REPEAT_COUNT export GIT_PERF_REPEAT_COUNT
get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf" "dirsOrRevs" get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf" "dirsOrRevs"