summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/tests/quilt-gbp24
1 files changed, 14 insertions, 10 deletions
diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index e528567..2dc9b42 100755
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -27,21 +27,25 @@ t-dgit --quilt=gbp --clean=git build-source
t-expect-fail 'specifies a different tree to your HEAD commit' \
t-dgit push
-t-refs-same-start
-t-ref-head
+test-push () {
+ t-refs-same-start
+ t-ref-head
-t-dgit --quilt=gbp push
+ t-dgit --quilt=gbp push
-t-gbp-pushed-good
+ t-gbp-pushed-good
+}
-exit 0
+test-push
-===
+echo wombat >>debian/pointless-for-dgit-test
+git add debian/pointless-for-dgit-test
+git commit -m 'Pointless 2'
-want to
+t-commit 'Check psuedomerge' 1.0-3
-make a new change
+t-dgit --quilt=gbp --clean=git build-source
-push it
+test-push
-check that the synthetic fast forward worked
+exit 0