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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 41e5ef86..b60ccb8e 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -18,12 +18,24 @@ t-gdr-good () {
 	# state should be one of
 	#   laundered
 	#   stitched
-	#   patches
+	#   pushed
 
 	git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
 
 	local etype netype bwtip
 
+	LC_MESSAGES=C t-git-debrebase status >../status.check
+	case $state in
+	laundered)
+		egrep '^  *branch is laundered' ../status.check
+		;;
+	stitched|pushed)
+		egrep \
+ '^  *branch contains furniture|^  *branch is unlaundered|^  *branch needs laundering' ../status.check
+		egrep '^  stitched$' ../status.check
+		;;
+	esac
+
 	case $state in
 	laundered)
 			etype=Upstream