From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 12:00:57 +0000 (+0000)
Subject: git-debrebase: test suite: t-gdr-good: split up the big case into two (nfc)
X-Git-Tag: archive/debian/5.0~186
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b2961d4e30d201c4a22e7a8659696a7dcb2e2e81;ds=sidebyside

git-debrebase: test suite: t-gdr-good: split up the big case into two (nfc)

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 74c571ab..d6d33f78 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -44,27 +44,40 @@ t-gdr-good () {
 		enparents=1
 		: "$ctype/$cetype" "$parents"
 		case "$ctype/$cetype" in
-		Pseudomerge/SAME)
+		Pseudomerge/SAME)			;;
+		Packaging/SAME)				;;
+		Packaging/Upstream)			;;
+		AddPatches/SAME)			;;
+		Changelog/Packaging)			;;
+		Changelog/Upstream)			;;
+		Upstream/SAME)				;;
+		BreakwaterUpstreamMerge/Upstream)	;;
+		BreakwaterUpstreamMerge/Packaging)	;;
+		*)
+			fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
+			;;
+		esac
+
+		case "$ctype" in
+		Pseudomerge)
 			expect=${info#Contributor=}
 			expect=${expect%% *}
 			enparents=2
 			git diff --quiet $expect..$cid
 			etype=Upstream
 			;;
-		Packaging/SAME|\
-		Packaging/Upstream)
+		Packaging)
 			git diff --quiet $expect..$cid -- ':.' ':!debian' 
 			git diff --quiet $expect..$cid -- ':debian/patches'
 			etype=Packaging
 			;;
-		AddPatches/SAME)
+		AddPatches)
 			git diff --quiet $expect..$cid -- \
 				':.' ':!debian/patches'
 			etype=$netype
 			netype=Upstream
 			;;
-		Changelog/Packaging|\
-		Changelog/Upstream)
+		Changelog)
 			git diff --quiet $expect..$cid -- \
 				':.' ':!debian/changelog'
 			etype=Packaging
@@ -72,13 +85,9 @@ t-gdr-good () {
 		Upstream/SAME)
 			git diff --quiet $expect..$cid -- ':debian'
 			;;
-		BreakwaterUpstreamMerge/Upstream| \
-		BreakwaterUpstreamMerge/Packaging)
+		BreakwaterUpstreamMerge)
 			break
 			;;
-		*)
-			fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
-			;;
 		esac
 
 		local cnparents=`printf "%s" "$parents" | wc -w`