# state should be one of
# laundered
# stitched
- # patches
+ # pushed
git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
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'