dgit: HEAD/.dsc mismatch error: Much better message

[dgit.git] / tests / tests / quilt-gbp

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index ac8a42651b4abb0201c25895c785f466748928d5..fe68222c149d74fc42a7fa973870249eb2352687 100755 (executable)
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -4,27 +4,30 @@ set -e
 
 t-tstunt-parsechangelog
 
 
 t-tstunt-parsechangelog
 

-t-newtag
-

 t-gbp-example-prep
 
 t-expect-fail 'quilt fixup cannot be linear' \
   t-dgit build-source
 
 t-gbp-example-prep
 
 t-expect-fail 'quilt fixup cannot be linear' \
   t-dgit build-source
 

+t-git-config dgit-distro.test-dummy.dgit-tag-format new
+t-expect-fail 'requires split view so server needs to support' \
+t-dgit -wgf --quilt=gbp build-source
+t-newtag
+

 t-dgit --quilt=gbp build-source
 
 t-dgit --quilt=gbp build-source
 

-t-dgit --quilt=gbp --gbp=no-such-command-gbp build-source
+t-dgit --quilt=gbp --gbp-pq=no-such-command-gbp build-source

 
 echo spong >debian/pointless-for-dgit-test
 git add debian/pointless-for-dgit-test
 git commit -m Pointless
 
 t-expect-fail no-such-command-gbp \
 
 echo spong >debian/pointless-for-dgit-test
 git add debian/pointless-for-dgit-test
 git commit -m Pointless
 
 t-expect-fail no-such-command-gbp \

-t-dgit --quilt=gbp --clean=git --gbp=no-such-command-gbp build-source
+t-dgit --quilt=gbp --clean=git --gbp-pq=no-such-command-gbp build-source

 
 t-dgit --quilt=gbp --clean=git build-source
 
 
 t-dgit --quilt=gbp --clean=git build-source
 

-t-expect-fail 'specifies a different tree to your HEAD commit' \
+t-expect-fail "HEAD specifies a different tree to $p" \

   t-dgit push
 
 test-push () {
   t-dgit push
 
 test-push () {