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 23083a7667d4144d6b271de106cf86149d38dd52..38d2489b21bf43d242e06e1119303d3f73e93e25 100755
(executable)
--- 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 -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
t-dgit --quilt=gbp --gbp-pq=no-such-command-gbp build-source
@@
-25,21
+26,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-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 'specifies a different tree to your HEAD commit' \
- t-dgit push
-
-test-push () {
+test-push-1 () {
t-refs-same-start
t-ref-head
t-refs-same-start
t-ref-head
+}
- t-dgit --quilt=gbp push
+test-push-2 () {
+ t-dgit --quilt=gbp --dgit-view-save=split.p push
t-gbp-pushed-good
}
t-gbp-pushed-good
}
-test-push
+test-push-1
+
+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
+
+test-push-2
echo wombat >>debian/pointless-for-dgit-test
git add debian/pointless-for-dgit-test
echo wombat >>debian/pointless-for-dgit-test
git add debian/pointless-for-dgit-test
@@
-47,8
+52,10
@@
git commit -m 'Pointless 2'
t-commit 'Check pseudomerge' 1.0-3
t-commit 'Check pseudomerge' 1.0-3
-t-dgit --quilt=gbp --clean=git build-source
+test-push-1
+
+t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source
-test-push
+test-push
-2
echo ok.
echo ok.