git-debrebase: test suite: introduce t-gdr-same-as-before

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 4cfa62b0354d82f110be2f9384313bef547f5142..cb937734dac3c205521683d9ffe6764c6b859e81 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -12,6 +12,11 @@ t-git-debrebase () {
 '
 }
 
+t-gdr-same-as-before () {
+       local beforetag=$1
+       git diff ${beforetag-t.before} -- ':.' ':!debian/patches'
+}
+
 t-gdr-branch-structure () {
        local state=$1
        # state should be one of

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index cff33b1d1e791506ac209d2078fbab081d06f570..2d596fc6a5cf2c637be6e07ab4429769abc85f78 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -21,17 +21,15 @@ t-dch-commit -r sid
 git tag t.before
 
 t-git-debrebase
-
-git diff t.before -- ':.' ':!debian/patches'
-
+t-gdr-same-as-before
 t-gdr-branch-structure laundered
 
 t-git-debrebase stitch --prose=wombat
-
+t-gdr-same-as-before
 t-gdr-branch-structure stitched
 
 t-dgit push-source
-
+t-gdr-same-as-before
 t-gdr-branch-structure pushed
 
 : todo 'more tests: convert dgit import new upstream version'