git-debrebase: test suite: gdr-edits: check branch structure after last push

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index fb58bf9c08a1556d4297acc0af99e64c8a52bc6d..f6333073cdf0ad42fedcdb672b05c5fa73ba2b7c 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -19,10 +19,12 @@ t-gdr-branch-structure () {
        #   stitched
        #   patches
 
        #   stitched
        #   patches
 

+       local etype netype
+

        case $state in
        laundered)      etype=Upstream  ;;
        stitched)       etype=Pseudomerge ;;
        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
        esac
 
        t-git-debrebase analyse >../anal.check


@@ -52,6 +54,12 @@ t-gdr-branch-structure () {
                        git diff --quiet $expect..$cid -- ':debian/patches'
                        etype=Packaging
                        ;;
                        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 -- \
                Changelog/Packaging|\
                Changelog/Upstream)
                        git diff --quiet $expect..$cid -- \