#
-baredebian-test () {
+baredebian-test-vars () {
+ quiltmode=baredebian
+ v=1.0-1
+ suite=sid
+ uv=${v%-*}
+ uvtag=v$uv
+}
+
+baredebian-test-core () {
t-expect-fail 'contradicts clean mode git-ff' \
t-dgit -wgf --dgit-view-save=split.f1 --$quiltmode quilt-fixup
t-dgit -wn --dgit-view-save=split.f1 --$quiltmode quilt-fixup
- v=1.0-1
- suite=sid
-
- tar --strip-components=1 -axf ../${p}_${v%-*}.orig.tar.*
+ tar --strip-components=1 -axf ../${p}_${uv}.orig.tar.*
cd debian
git clean -xdff
t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.b quilt-fixup
t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.p --new push
- git merge-base --is-ancestor v${v%-*} split.p
+ git merge-base --is-ancestor $uvtag split.p
git merge-base --is-ancestor HEAD split.p
- set +e; git merge-base HEAD v${v%-*}; rc=$?; set -e; [ $rc = 1 ]
+ set +e; git merge-base HEAD $uvtag; rc=$?; set -e; [ $rc = 1 ]
git clean -xdff
# t-pushed-good-* wants a clean tree to start with, but this
t-splitbrain-pushed-good-end-made-dep14
}
+
+baredebian-test () {
+ baredebian-test-vars
+ baredebian-test-core
+}