git-debrebase: capture breakwater tip

[dgit.git] / tests / lib-core

diff --git a/tests/lib-core b/tests/lib-core
index 056a1bc188c49f568df6046af46f94d2907c7f73..d65a1ffeccadcde3e9b9268f35be39620e4221fe 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}"
 }
 
@@ -20,10 +22,13 @@ t-set-using-tmp () {
        export DGIT_TEST_DUMMY_DIR=$tmp
        export DGIT_TEST_TMP=$tmp
        export GNUPGHOME=$tmp/nonexistent
+       git config --global user.email 'dgit-test@debian.example.net'
+       git config --global user.name 'dgit test git user'
+       git config --global protocol.ext.allow always
 }
 
 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:"