diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-03 21:18:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-03 21:18:55 (GMT) |
| commit | 54ea72f09c34eea6646af886b8efb06ddcee5299 (patch) | |
| tree | 52fb58fba1ad19210b2c5dabe8c04fd8cde993be /t/test-lib.sh | |
| parent | 5d826e972970a784bd7a7bdf587512510097b8c7 (diff) | |
| parent | 5826b7b595e318e8f52a186cabbbc65b769315ec (diff) | |
| download | git-54ea72f09c34eea6646af886b8efb06ddcee5299.zip git-54ea72f09c34eea6646af886b8efb06ddcee5299.tar.gz git-54ea72f09c34eea6646af886b8efb06ddcee5299.tar.bz2 | |
Merge branch 'sg/test-bash-version-fix'
* sg/test-bash-version-fix:
test-lib: check Bash version for '-x' without using shell arrays
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 0f1faa2..c34831a 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -323,12 +323,12 @@ do # this test is marked as such, and ignore '-x' if it # isn't executed with a suitable Bash version. if test -z "$test_untraceable" || { - test -n "$BASH_VERSION" && { + test -n "$BASH_VERSION" && eval ' test ${BASH_VERSINFO[0]} -gt 4 || { test ${BASH_VERSINFO[0]} -eq 4 && test ${BASH_VERSINFO[1]} -ge 1 } - } + ' } then trace=t |