From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Feb 2018 12:30:08 +0000 (+0000)
Subject: git-debrebase: test suite: spot any merges which have multiple identical parents
X-Git-Tag: archive/debian/5.0~142
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=27f43c89f66b2ca6d159a38cabb942ca18774857;p=dgit.git

git-debrebase: test suite: spot any merges which have multiple identical parents

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 565e0b16..9a23cd5b 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -106,6 +106,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' ;;