mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-lib.sh: fix prepend_var() quoting issue

Browse Source 
Fix a quoting issue in the function introduced in
b9638d7286 (test-lib: make $GIT_BUILD_DIR an absolute path,
2022-02-27), running the test suite where the git checkout was on a
path with e.g. a space in it would fail.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-06-30 12:18:35 +02:00
committed by Junio C Hamano
parent 386e7a9d30
commit 361fa321ec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/test-lib.sh
View File

@ -57,14 +57,14 @@ fi
# #
# prepend_var VAR : VALUE # prepend_var VAR : VALUE
prepend_var () { prepend_var () {
eval "$1=$3\${$1:+${3:+$2}\$$1}" eval "$1=\"$3\${$1:+${3:+$2}\$$1}\""
} }
# If [AL]SAN is in effect we want to abort so that we notice # If [AL]SAN is in effect we want to abort so that we notice
# problems. The GIT_SAN_OPTIONS variable can be used to set common # problems. The GIT_SAN_OPTIONS variable can be used to set common
# defaults shared between [AL]SAN_OPTIONS. # defaults shared between [AL]SAN_OPTIONS.
prepend_var GIT_SAN_OPTIONS : abort_on_error=1 prepend_var GIT_SAN_OPTIONS : abort_on_error=1
prepend_var GIT_SAN_OPTIONS : strip_path_prefix=\"$GIT_BUILD_DIR/\" prepend_var GIT_SAN_OPTIONS : strip_path_prefix="$GIT_BUILD_DIR/"
# If we were built with ASAN, it may complain about leaks # If we were built with ASAN, it may complain about leaks
# of program-lifetime variables. Disable it by default to lower # of program-lifetime variables. Disable it by default to lower