And abolish the two things it was made of.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
'
}
-t-gdr-same-as-before () {
- local beforetag=$1
- git diff ${beforetag-t.before} -- ':.' ':!debian/patches'
-}
-
-t-gdr-branch-structure () {
+t-gdr-good () {
local state=$1
+ local beforetag=$2 # say HEAD to skip this check
# state should be one of
# laundered
# stitched
# patches
+ git diff ${beforetag-t.before} -- ':.' ':!debian/patches'
+
local etype netype
case $state in
git tag t.before
t-git-debrebase
-t-gdr-same-as-before
-t-gdr-branch-structure laundered
+t-gdr-good laundered
t-git-debrebase stitch --prose=wombat
-t-gdr-same-as-before
-t-gdr-branch-structure stitched
+t-gdr-good stitched
t-dgit push-source
-t-gdr-same-as-before
-t-gdr-branch-structure pushed
+t-gdr-good pushed
: todo 'more tests: convert dgit import new upstream version'
: todo 'more tests: convert dgit import same upstream version'