debrel: debrebase before push-source

See dgit-maint-debrebase(7).

1 files changed, 8 insertions, 0 deletions

diff --git a/bin/debrel b/bin/debrel
index 090f045e..4d0678d1 100755
--- a/bin/debrel
+++ b/bin/debrel
@@ -22,6 +22,14 @@ if [ "$(dpkg-parsechangelog -SDistribution)" = "UNRELEASED" ]; then
     git commit --include debian/changelog \
         -m"finalise changelog for $(dpkg-parsechangelog -SVersion) upload"
 fi
+
+# this is not a general test for whether a package is being maintained with
+# git-debrebase, but it will ensure the `dch -r` commit is behind the patch
+# queue in most cases
+if git show-ref | grep -q "refs/ffq-prev\\|refs/debrebase-last"; then
+    git debrebase
+fi
+
 dgit push-source "$@"
 git push --follow-tags