Conveniently, the places where we don't want this, and are
deliberately looking for dgit-self-made patches, are gdr-makepatches7
and mix-it in gdr-subcommands; there, we don't push, so don't end up
checking t-gdr-made-patches.
We also add this check to the appropriate place in gdr-subcommands.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
# stitched
# pushed
+ case $state in
+ pushed*)
+ t-gdr-made-patches
+ ;;
+ esac
+
git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
LC_MESSAGES=C t-git-debrebase status >../status.check
git branch -D master
git branch -m quilt-tip master
}
+
+t-gdr-made-patches () {
+ git log -n1 --'pretty=format:%B' \
+ | egrep '^\[git-debrebase'
+}
P*)
t-dgit -wgf --quilt=nofix quilt-fixup
git diff HEAD~ debian/patches | egrep .
+ t-gdr-made-patches
git diff --quiet HEAD~ -- ':.' ':!debian/patches'
git reset --hard HEAD~
;;