git-debpush: Check that patches are (un)applicable

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 3a5b29f432e4567137451bbe8116a3363f2749c5..78ec9a712153d56b8a349532d6e18fc106cd48e5 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -777,11 +777,12 @@ t-splitbrain-pushed-good-start () {
 
        t-refs-same-start
        t-ref-same refs/heads/split.p
-       case "$(t-git-get-ref refs/heads/split.b)" in
+       local split_b=$(t-git-get-ref refs/heads/split.b)
+       case "$split_b" in
        "$t_ref_val") ;;
        "$(git rev-parse refs/heads/split.p^0)") ;;
        "$(git rev-parse refs/heads/split.p^1)") ;;
-       *) fail 'bad b/p' ;;
+       *) fail "bad b/p (b=$split_b)" ;;
        esac
        t-pushed-good-core
 
@@ -1027,7 +1028,6 @@ t-git-pseudo-merge () {
 }
 
 t-gbp-example-prep-no-ff () {
-       t-tstunt-parsechangelog
        t-archive example 1.0-1
        t-git-none
        t-worktree 1.0
@@ -1187,7 +1187,7 @@ t-debpolicy () {
        t-dsd
        t-policy dgit-repos-policy-debian
 
-       mkdir $tmp/git
+       mkdir -p $tmp/git
        t-policy-admin create-db
 }