chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wip.tutorials' into wip
[dgit.git]
/
tests
/
tests
/
quilt-gbp
diff --git
a/tests/tests/quilt-gbp
b/tests/tests/quilt-gbp
index e528567ffd93886b80c3d24995ff5768e5b2ee90..38d2489b21bf43d242e06e1119303d3f73e93e25 100755
(executable)
--- a/
tests/tests/quilt-gbp
+++ b/
tests/tests/quilt-gbp
@@
-4,44
+4,58
@@
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-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 --gbp=no-such-command-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
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
+test-push-1 () {
+ t-refs-same-start
+ t-ref-head
+}
-t
-expect-fail 'specifies a different tree to your HEAD commit' \
-
t-dgit
push
+t
est-push-2 () {
+
t-dgit --quilt=gbp --dgit-view-save=split.p
push
-t-refs-same-start
-t-ref-head
+ t-gbp-pushed-good
+}
-t
-dgit --quilt=gbp push
+t
est-push-1
-t-
gbp-pushed-good
+t-
dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source
-exit 0
+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'
-===
+t-commit 'Check pseudomerge' 1.0-3
-want to
+test-push-1
-
make a new chang
e
+
t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-sourc
e
-push it
+test-push-2
-check that the synthetic fast forward worked
+echo ok.