Test suite: quilt-gbp: Check that we do not update user's HEAD

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

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index 085ef03a6aac4413261ac8bc5300c90eda1973d4..21e396bc42bbcc9d04502942fd38d47c777d7696 100755 (executable)
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -16,30 +16,34 @@ t-newtag
 
 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 \
-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-expect-fail 'specifies a different tree to your HEAD commit' \
-  t-dgit push
-
-test-push () {
+test-push-1 () {
        t-refs-same-start
        t-ref-head
+}
 
+test-push-2 () {
        t-dgit --quilt=gbp push
 
        t-gbp-pushed-good
 }
 
-test-push
+test-push-1
+
+t-dgit --quilt=gbp --clean=git build-source
+
+t-expect-fail "HEAD specifies a different tree to $p" \
+  t-dgit push
+
+test-push-2
 
 echo wombat >>debian/pointless-for-dgit-test
 git add debian/pointless-for-dgit-test
@@ -47,8 +51,10 @@ git commit -m 'Pointless 2'
 
 t-commit 'Check pseudomerge' 1.0-3
 
+test-push-1
+
 t-dgit --quilt=gbp --clean=git build-source
 
-test-push
+test-push-2
 
 echo ok.