From 4dea77665732625beb1e7b8be5f459dd3b4c7fd7 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Feb 2018 15:01:03 +0000
Subject: [PATCH 1/1] git-debrebase: test suite: gdr-edits: check branch
 structure after last push

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 tests/lib-gdr         | 10 +++++++++-
 tests/tests/gdr-edits |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/lib-gdr b/tests/lib-gdr
index fb58bf9c..f6333073 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -19,10 +19,12 @@ t-gdr-branch-structure () {
 	#   stitched
 	#   patches
 
+	local etype netype
+
 	case $state in
 	laundered)	etype=Upstream	;;
 	stitched)	etype=Pseudomerge ;;
-	patches)	etype=XXX-TODO ;;
+	pushed)		etype=AddPatches; netype=Pseudomerge ;;
 	esac
 
 	t-git-debrebase analyse >../anal.check
@@ -52,6 +54,12 @@ t-gdr-branch-structure () {
 			git diff --quiet $expect..$cid -- ':debian/patches'
 			etype=Packaging
 			;;
+		AddPatches/SAME)
+			git diff --quiet $expect..$cid -- \
+				':.' ':!debian/patches'
+			etype=$netype
+			netype=Upstream
+			;;
 		Changelog/Packaging|\
 		Changelog/Upstream)
 			git diff --quiet $expect..$cid -- \
diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 5388f049..30786fee 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -45,6 +45,8 @@ t-gdr-branch-structure stitched
 
 t-dgit push-source
 
+t-gdr-branch-structure pushed
+
 : todo 'more tests: convert dgit import new upstream version'
 : todo 'more tests: convert dgit import same upstream version'
 : todo 'more tests: other maint updated, we must fetch'
-- 
2.30.2