X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib;h=6c55cba2a579fa83e4434972eea9b54831765c76;hb=a037a4ff36b293d567f77cbdf63aa24e34057a41;hp=039484d0cb7711e9dd54c3cb3cfc662eeea21d20;hpb=7f86851eef3962fb5d6c1953df1b3d1ac6776aa1;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 039484d0..6c55cba2 100644
--- a/tests/lib
+++ b/tests/lib
@@ -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
@@ -618,6 +619,13 @@ t-splitbrain-pushed-good-start () {
 	git merge-base --is-ancestor $dep14tag $dgittag
 
 	t-refs-same-start
+	t-ref-same refs/heads/split.p
+	case "$(t-git-get-ref refs/heads/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' ;;
+	esac
 	t-pushed-good-core
 
 	t-incoming-dsc