diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 12:34:48 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:59 +0100 |
commit | 9f3a065563b0277ee1ffffc747829884aa986e95 (patch) | |
tree | 24bc49616a1a7e15a00d768aa352a36a79d40912 /tests | |
parent | 27f43c89f66b2ca6d159a38cabb942ca18774857 (diff) |
git-debrebase: test suite: spot any pointless pseudomerges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib-gdr | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index 9a23cd5..41e5ef8 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -78,6 +78,16 @@ t-gdr-good () { enparents=2 git diff --quiet $expect..$cid etype=Upstream + + : 'reject pointless pseudomerges' + local overwritten=${parents/$expect/} + overwritten=${overwritten// /} + t-git-debrebase analyse $overwritten >../anal.overwr + local ocid otype oinfo + read <../anal.overwr ocid otype oinfo + case "$otype" in + Pseudomerge) test "x$info" != "x$oinfo" ;; + esac ;; Packaging) git diff --quiet $expect..$cid -- ':.' ':!debian' |