X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-gdr;h=9eb75371102f14e4648f8bef5d12f0d907c462db;hp=08717dd413c113cfc7eca638c2a85058de3b3b89;hb=c0df25cd65b0172d5130e01a73aa610c3b0dd105;hpb=817b18a94707497d21c5a467bdd789e7b039f666 diff --git a/tests/lib-gdr b/tests/lib-gdr index 08717dd4..9eb75371 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -47,6 +47,7 @@ t-gdr-good () { ;; stitched) etypes=Pseudomerge-Upstream ;; pushed) etypes=AddPatches-Pseudomerge-Upstream ;; + pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;; esac t-git-debrebase analyse >../anal.check @@ -68,6 +69,7 @@ t-gdr-good () { Packaging/SAME) ;; Packaging/Upstream) ;; AddPatches/SAME) ;; + AddPatches/AddPatchesInterop) ;; Changelog/Packaging) ;; Changelog/Upstream) ;; Upstream/SAME) ;; @@ -87,6 +89,13 @@ t-gdr-good () { fi esac + case "$cetype" in + AddPatchesInterop) + git log -n1 --pretty=format:%B \ + | grep '^\[git-debrebase[ :]' + ;; + esac + case "$ctype" in Pseudomerge) expect=${info#Contributor=}