chiark / gitweb /
git-debrebase: test suite: spot any pointless pseudomerges
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 18 Feb 2018 12:34:48 +0000 (12:34 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:06:59 +0000 (16:06 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/lib-gdr

index 9a23cd5..41e5ef8 100644 (file)
@@ -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'