changelog: Fix ref to #842577

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index caa69d0964d3c7b1e1aa377698eb0004668bb150..23daeace743e6e06e0fa36c5e81bdee43670eaa1 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -198,11 +198,11 @@ t-has-ancestor () {
        fi
 }
 
-t-has-parent () {
-       # t-has-parent CHILD PARENT
+t-has-parent-or-is () {
+       # t-has-parent-or-is CHILD PARENT
        local child=$1
        local parent=$2
-       local parents=$(git show --pretty=format:' %P ' "$child")
+       local parents=$(git show --pretty=format:' %P %H ' "$child")
        parent=$(git rev-parse "$parent~0")
        case "$parents" in
        *" $parent "*)  ;;
@@ -589,6 +589,7 @@ t-splitbrain-pushed-good--unpack () {
        mkdir t-unpack
        cd t-unpack
        ln -s $tmp/mirror/pool/main/*.orig*.tar* .
+       ln -s $tmp/incoming/*.orig*.tar* . ||:
        ln -s $incoming_dsc .
        ln -s ${incoming_dsc/.dsc/.debian.tar}* .
        dpkg-source "$@" -x *.dsc