X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=caa69d0964d3c7b1e1aa377698eb0004668bb150;hb=8e3a97ee058cdfd1d9318fff2e9dcea9c78bb98d;hp=401331a2a8378eeca25aded59e15de76475fb8e5;hpb=cd50f9c3ca13efec84cc82fc20798e883fa6ba97;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 401331a2..caa69d09 100644
--- a/tests/lib
+++ b/tests/lib
@@ -492,14 +492,16 @@ t-ref-same-val () {
 	case "${t_ref_val-unset}" in
 	unset)		;;
 	"$val")		;;
-	*)		fail "ref varies: $name:\
- ${val:-nothing} != ${t_ref_val:-nothing}" ;;
+	*)		fail "ref varies: ($name)\
+ ${val:-nothing} != ${t_ref_val:-nothing} (${t_ref_names[*]})" ;;
 	esac
 	t_ref_val="$val"
+	t_ref_names+=("$name")
 }
 
 t-refs-same-start () {
 	unset t_ref_val
+	t_ref_names=()
 }
 
 t-refs-same () {
@@ -616,6 +618,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