X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-core;h=c3a04cbaed1b215cfd62c33b7455976f7a2c4a73;hp=056a1bc188c49f568df6046af46f94d2907c7f73;hb=7d0d834d7b41b5f3cafffc37b9a9d94966c68e0f;hpb=816ed64edd5f42c114bda166878008e6a3877215

diff --git a/tests/lib-core b/tests/lib-core
index 056a1bc1..c3a04cba 100644
--- a/tests/lib-core
+++ b/tests/lib-core
@@ -8,10 +8,13 @@ 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
+	: ${DGIT_GITDEBREBASE_TEST:=$DGIT_TEST_INTREE/git-debrebase}
+	export DGIT_TEST DGIT_BADCOMMIT_FIXUP
+	export DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
 	export PERLLIB="$DGIT_TEST_INTREE${PERLLIB:+:}${PERLLIB}"
 }
 
@@ -20,10 +23,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:"