set -e
. tests/lib
+t-tstunt-parsechangelog
+
t-gbp-example-prep
t-expect-fail 'quilt fixup cannot be linear' \
t-dgit build-source
-t-dgit --quilt=gbp 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 --dgit-view-save=split.b1 build-source
+git rev-parse split.b1
-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
+test-push-1 () {
+ t-refs-same-start
+ t-ref-head
+}
-t-expect-fail 'specifies a different tree to your HEAD commit' \
- t-dgit push
+test-push-2 () {
+ t-dgit --quilt=gbp --dgit-view-save=split.p push
+
+ t-gbp-pushed-good
+}
-exit 0
+test-push-1
-===
+t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source
-want to
+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
+git commit -m 'Pointless 2'
- do push
- t-pushed-good
- check that
- - we didn't update caller's branch
+t-commit 'Check pseudomerge' 1.0-3
- do fetch
- check that this didn't update dgit remote ref
+test-push-1
- check that Dgit hash in dsc refers to tree identical
- to dpkg-source -x
+t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source
- check that that tree
- - has patches applied (reuse rules build magic)
- - has .gitignore edited
+test-push-2
+t-ok