diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-16 20:32:38 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:03:11 +0100 |
commit | 61d6570d98dcc929a2f12c2ad6396dd03321cd78 (patch) | |
tree | 17a0acaeba3303dcf5f9f71694cd12b54e273ddd /tests | |
parent | 93e32c149f6901257f10e688f2de60bcdbe8675e (diff) |
git-debrebase: test suite: introduce t-gdr-same-as-before
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib-gdr | 5 | ||||
-rwxr-xr-x | tests/tests/gdr-edits | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index 4cfa62b..cb93773 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 cff33b1..2d596fc 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' |