summaryrefslogtreecommitdiff
path: root/tests/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-13 16:45:35 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-13 16:45:35 +0100
commite2375ddbcc01dffeab02f2634930f26d1f496f2d (patch)
treeeb039cf23740fdc4c388e883e044ff3fccc916a5 /tests/tests
parent65c48410ed9950ec403b52d8a277a265b3fb7e6d (diff)
Test suite: quilt-gbp: Check that we do not update user's HEAD
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-xtests/tests/quilt-gbp22
1 files changed, 14 insertions, 8 deletions
diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index fe68222..21e396b 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.