From 9f3a065563b0277ee1ffffc747829884aa986e95 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Feb 2018 12:34:48 +0000 Subject: [PATCH] git-debrebase: test suite: spot any pointless pseudomerges Signed-off-by: Ian Jackson --- tests/lib-gdr | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/lib-gdr b/tests/lib-gdr index 9a23cd5b..41e5ef86 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' -- 2.30.2