diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-15 09:47:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-15 09:47:18 -0700 |
| commit | 3d7b2b41964dbe41c3721415b395e07518f7e06d (patch) | |
| tree | 4f9834168ce91ea3712f2746396f70081f99810e | |
| parent | Git 2.27-rc0 (diff) | |
| download | tgif-3d7b2b41964dbe41c3721415b395e07518f7e06d.tar.xz | |
Revert "t/test_lib: avoid naked bash arrays in file_lineno"
This reverts commit 303775a25f0b4ac5d6ad2e96eb4404c24209cad8;
instead of trying to salvage the tap-breaking change, let's
revert the whole thing for now.
| -rw-r--r-- | t/test-lib.sh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index baf94546da..1b221951a8 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -677,16 +677,14 @@ die () { file_lineno () { test -z "$GIT_TEST_FRAMEWORK_SELFTEST" && test -n "$BASH" || return 0 - eval ' - local i - for i in ${!BASH_SOURCE[*]} - do - case $i,"${BASH_SOURCE[$i]##*/}" in - 0,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:$LINENO: ${1+$1: }"; return;; - *,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:${BASH_LINENO[$(($i-1))]}: ${1+$1: }"; return;; - esac - done - ' + local i + for i in ${!BASH_SOURCE[*]} + do + case $i,"${BASH_SOURCE[$i]##*/}" in + 0,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:$LINENO: ${1+$1: }"; return;; + *,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:${BASH_LINENO[$(($i-1))]}: ${1+$1: }"; return;; + esac + done } GIT_EXIT_OK= |