X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-gbp;h=3ef89e8c65171232e52406c3d39c884076a19628;hb=8e4a69d54bb811aabe6eb2b133d142771c30f997;hp=21e396bc42bbcc9d04502942fd38d47c777d7696;hpb=e2375ddbcc01dffeab02f2634930f26d1f496f2d;p=dgit.git diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index 21e396bc..3ef89e8c 100755 --- a/tests/tests/quilt-gbp +++ b/tests/tests/quilt-gbp @@ -14,7 +14,8 @@ 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 --dgit-view-save=split.b1 build-source +git rev-parse split.b1 t-dgit --quilt=gbp --gbp-pq=no-such-command-gbp build-source @@ -31,14 +32,14 @@ test-push-1 () { } test-push-2 () { - t-dgit --quilt=gbp push + t-dgit --quilt=gbp --dgit-view-save=split.p push t-gbp-pushed-good } test-push-1 -t-dgit --quilt=gbp --clean=git build-source +t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source t-expect-fail "HEAD specifies a different tree to $p" \ t-dgit push @@ -53,8 +54,8 @@ t-commit 'Check pseudomerge' 1.0-3 test-push-1 -t-dgit --quilt=gbp --clean=git build-source +t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source test-push-2 -echo ok. +t-ok