X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=41e5ef862ac2866df123f4fa1d77d3d7cfb2adb4;hb=9f3a065563b0277ee1ffffc747829884aa986e95;hp=0fc55e3ec09cd8665b34ee148a9b0493aedc220a;hpb=51a8006237f3882101297df7b5c29f2d15a7641e;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 0fc55e3e..41e5ef86 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -55,8 +55,8 @@ t-gdr-good () {
 		Changelog/Packaging)			;;
 		Changelog/Upstream)			;;
 		Upstream/SAME)				;;
-		BreakwaterUpstreamMerge/Upstream)	;;
-		BreakwaterUpstreamMerge/Packaging)	;;
+		Anchor/Upstream)			;;
+		Anchor/Packaging)			;;
 		*)
 			fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
 			;;
@@ -78,6 +78,16 @@ t-gdr-good () {
 			enparents=2
 			git diff --quiet $expect..$cid
 			etype=Upstream
+
+			: 'reject pointless pseudomerges'
+			local overwritten=${parents/$expect/}
+			overwritten=${overwritten// /}
+			t-git-debrebase analyse $overwritten >../anal.overwr
+			local ocid otype oinfo
+			read <../anal.overwr ocid otype oinfo
+			case "$otype" in
+			Pseudomerge) test "x$info" != "x$oinfo" ;;
+			esac
 			;;
 		Packaging)
 			git diff --quiet $expect..$cid -- ':.' ':!debian' 
@@ -98,7 +108,7 @@ t-gdr-good () {
 		Upstream/SAME)
 			git diff --quiet $expect..$cid -- ':debian'
 			;;
-		BreakwaterUpstreamMerge)
+		Anchor)
 			break
 			;;
 		esac
@@ -106,6 +116,11 @@ t-gdr-good () {
 		local cnparents=`printf "%s" "$parents" | wc -w`
 		test $cnparents = $enparents
 
+		local cndparents=`
+	for f in $parents; do echo $f; done | sort -u | wc -w
+				`
+		test $cndparents = $cnparents
+
 		case "$parents" in
 		*"$expect"*)	;;
 		*)		fail 'unexpected parent' ;;
@@ -208,6 +223,9 @@ t-nmu-causes-ff-fail () {
 
 	t-expect-fail E:'Not.*fast-forward' \
 	git merge --ff-only dgit/dgit/sid
+
+	t-expect-fail E:'-fdiverged.*refs/remotes/dgit/dgit/sid' \
+	t-git-debrebase
 }
 
 t-nmu-reconciled-good () {