git-playtree-create: Fix with tests/using-intree

Reported-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debpush b/git-debpush
index ca737d20a97fd341dff16a10d46329b62e60dfac..0be0bf4a37b486b707771246117382e2802a56d3 100755 (executable)
--- a/git-debpush
+++ b/git-debpush
@@ -39,6 +39,7 @@ set -o pipefail
 
 us="$(basename $0)"
 git_playtree_create=git-playtree-create ###substituted###
+git_playtree_create=${DEBPUSH_GIT_PLAYTREE_CREATE-$git_playtree_create}
 
 cleanup() {
     if [ -d "$temp" ]; then

diff --git a/tests/lib-core b/tests/lib-core
index bdf3a6c350d95c57272b7c7de438d097ddb70551..cbcd602bc6fc116536339fb8f306f78e7a83521a 100644 (file)
--- a/tests/lib-core
+++ b/tests/lib-core
@@ -15,9 +15,10 @@ t-set-intree () {
        : ${DGIT_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
        : ${DGIT_GITDEBREBASE_TEST:=$DGIT_TEST_INTREE/git-debrebase}
        : ${DGIT_MANPAGES_SOURCE_DIR:=$DGIT_TEST_INTREE}
+       : ${DEBPUSH_GIT_PLAYTREE_CREATE:=$DGIT_TEST_INTREE/git-playtree-create}
        export DGIT_TEST DGIT_BADCOMMIT_FIXUP
        export DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
-       export DGIT_MANPAGES_SOURCE_DIR
+       export DGIT_MANPAGES_SOURCE_DIR DEBPUSH_GIT_PLAYTREE_CREATE
        export PERLLIB="$DGIT_TEST_INTREE${PERLLIB:+:}${PERLLIB}"
 }