From 61d6570d98dcc929a2f12c2ad6396dd03321cd78 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 16 Feb 2018 20:32:38 +0000 Subject: [PATCH 1/1] git-debrebase: test suite: introduce t-gdr-same-as-before Signed-off-by: Ian Jackson --- tests/lib-gdr | 5 +++++ tests/tests/gdr-edits | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/lib-gdr b/tests/lib-gdr index 4cfa62b0..cb937734 100644 --- 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 cff33b1d..2d596fc6 100755 --- 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' -- 2.30.2