From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Feb 2018 12:34:48 +0000 (+0000)
Subject: git-debrebase: test suite: spot any pointless pseudomerges
X-Git-Tag: archive/debian/5.0~141
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=9f3a065563b0277ee1ffffc747829884aa986e95

git-debrebase: test suite: spot any pointless pseudomerges

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 9a23cd5b..41e5ef86 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -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'