diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-21 16:35:22 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-21 16:47:41 +0100 |
| commit | 1e947003e9b48254d349f000eaab3849511eb55e (patch) | |
| tree | 433590f9e41e2083bc6cc5af3d57bc8d46394058 | |
| parent | 952c287d284ea005f0f31dfc0904885cc5099d5b (diff) | |
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>
| -rwxr-xr-x | git-debpush | 1 | ||||
| -rw-r--r-- | tests/lib-core | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/git-debpush b/git-debpush index ca737d2..0be0bf4 100755 --- 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 bdf3a6c..cbcd602 100644 --- 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}" } |