X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fquilt-gbp;h=21e396bc42bbcc9d04502942fd38d47c777d7696;hp=fe68222c149d74fc42a7fa973870249eb2352687;hb=e2375ddbcc01dffeab02f2634930f26d1f496f2d;hpb=65c48410ed9950ec403b52d8a277a265b3fb7e6d diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index fe68222c..21e396bc 100755 --- a/tests/tests/quilt-gbp +++ b/tests/tests/quilt-gbp @@ -25,21 +25,25 @@ git commit -m Pointless t-expect-fail no-such-command-gbp \ 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 "HEAD specifies a different tree to $p" \ - 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.