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.
Junio C Hamano committed
May 15, 2020 at 09:47 UTC
3d7b2b41964dbe41c3721415b395e07518f7e06d
1 file changed
+8
-10
t/test-lib.sh
+8
-10
@@ -677,16 +677,14 @@ die () {
677
678
file_lineno () {
679
test -z "$GIT_TEST_FRAMEWORK_SELFTEST" && test -n "$BASH" || return 0
680
- eval '
681
- local i
682
- for i in ${!BASH_SOURCE[*]}
683
- do
684
- case $i,"${BASH_SOURCE[$i]##*/}" in
685
- 0,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:$LINENO: ${1+$1: }"; return;;
686
- *,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:${BASH_LINENO[$(($i-1))]}: ${1+$1: }"; return;;
687
- esac
688
- done
689
- '
680
+ local i
681
+ for i in ${!BASH_SOURCE[*]}
682
+ do
683
+ case $i,"${BASH_SOURCE[$i]##*/}" in
684
+ 0,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:$LINENO: ${1+$1: }"; return;;
685
+ *,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:${BASH_LINENO[$(($i-1))]}: ${1+$1: }"; return;;
686
+ esac
687
+ done
688
}
689
690
GIT_EXIT_OK=