From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 12:05:18 +0000 (+0000)
Subject: git-debrebase: test suite: t-gdr-good: test git-debrebase breakwater
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d25e432bce5e8891d3402869b48e497235d4bd91;p=dgit.git

git-debrebase: test suite: t-gdr-good: test git-debrebase breakwater

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index d6d33f78..aeb77254 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -22,10 +22,13 @@ t-gdr-good () {
 
 	git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
-	local etype netype
+	local etype netype bwtip
 
 	case $state in
-	laundered)	etype=Upstream	;;
+	laundered)
+			etype=Upstream
+			bwtip=Y:`t-git-debrebase breakwater`
+		;;
 	stitched)	etype=Pseudomerge ;;
 	pushed)		etype=AddPatches; netype=Pseudomerge ;;
 	esac
@@ -43,6 +46,7 @@ t-gdr-good () {
 		expect="$parents"
 		enparents=1
 		: "$ctype/$cetype" "$parents"
+
 		case "$ctype/$cetype" in
 		Pseudomerge/SAME)			;;
 		Packaging/SAME)				;;
@@ -58,6 +62,15 @@ t-gdr-good () {
 			;;
 		esac
 
+		case "$ctype/$etype" in
+		Packaging/Upstream|\
+		Changelog/Upstream)
+			if [ "x$bwtip" != x ]; then
+				test "$bwtip" = "Y:$cid"
+				bwtip=''
+			fi
+		esac
+
 		case "$ctype" in
 		Pseudomerge)
 			expect=${info#Contributor=}