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 74c571ab7743aa2bd7e705a96ec06f943206ddb7..d6d33f7851e568ff0bcf64ea1c69dd3d2f872f1c 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -44,27 +44,40 @@ t-gdr-good () {
                enparents=1
                : "$ctype/$cetype" "$parents"
                case "$ctype/$cetype" in
                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
                        ;;
                        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
                        ;;
                        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
                        ;;
                        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
                        git diff --quiet $expect..$cid -- \
                                ':.' ':!debian/changelog'
                        etype=Packaging


@@ -72,13 +85,9 @@ t-gdr-good () {
                Upstream/SAME)
                        git diff --quiet $expect..$cid -- ':debian'
                        ;;
                Upstream/SAME)
                        git diff --quiet $expect..$cid -- ':debian'
                        ;;

-               BreakwaterUpstreamMerge/Upstream| \
-               BreakwaterUpstreamMerge/Packaging)
+               BreakwaterUpstreamMerge)

                        break
                        ;;
                        break
                        ;;

-               *)
-                       fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
-                       ;;

                esac
 
                local cnparents=`printf "%s" "$parents" | wc -w`
                esac
 
                local cnparents=`printf "%s" "$parents" | wc -w`