Shell bug: avoid local=$(....) as it defeats set -e

[dgit.git] / tests / lib-core

diff --git a/tests/lib-core b/tests/lib-core
index 7ed27619ac3466b9a2900519412a53006cb709ad..6cdffeb155a479288124a98d9e613016c04b4dcb 100644 (file)
--- a/tests/lib-core
+++ b/tests/lib-core
@@ -8,10 +8,12 @@ fail () {
 t-set-intree () {
        if [ "x$DGIT_TEST_INTREE" = x ]; then return; fi
        : ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
+       : ${DGIT_BADCOMMIT_FIXUP:=$DGIT_TEST_INTREE/dgit-badcommit-fixup}
        : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/infra/dgit-repos-server}
        : ${DGIT_SSH_DISPATCH_TEST:=$DGIT_TEST_INTREE/infra/dgit-ssh-dispatch}
        : ${DGIT_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
-       export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
+       export DGIT_TEST DGIT_BADCOMMIT_FIXUP
+       export DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
        export PERLLIB="$DGIT_TEST_INTREE${PERLLIB:+:}${PERLLIB}"
 }
 
@@ -25,7 +27,7 @@ t-set-using-tmp () {
 }
 
 t-filter-out-git-hyphen-dir () {
-       local pathent=$(type -p git-rev-parse ||:)
+       local pathent; pathent=$(type -p git-rev-parse ||:)
        case "$pathent" in '') return ;; esac
        pathent=${pathent%/*}
        local path=":$PATH:"