Use force flag when pushing tags

[dgit.git] / tests / tests / drs-push-rejects

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 13567c3f3a7b771ca235af9589fdb5f8524310aa..3a709472efdb2b3fada31f544cf78eab6db03ee1 100755 (executable)
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -12,13 +12,8 @@ cd $p
 
 mustfail () {
        local mpat="$1"; shift
 
 mustfail () {
        local mpat="$1"; shift

-       t-reporefs pre-push
-
-       t-expect-fail "$mpat" \
-       git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
-
-       t-reporefs post-push
-       diff $tmp/show-refs.{pre,post}-push
+       t-expect-push-fail "$mpat" \
+       git push origin "$@"

 }
 
 mustsucceed () {
 }
 
 mustsucceed () {


@@ -103,7 +98,7 @@ mustfail 'sid != sponge' HEAD:refs/dgit/sponge $push_spec2
 prep unstable sid
 mktag
 mustfail 'push is missing tag ref update' $push_spec1
 prep unstable sid
 mktag
 mustfail 'push is missing tag ref update' $push_spec1

-mustfail 'push is missing head ref update' $push_spec2
+mustfail 'push is missing head ref update' +$push_spec2

 mustfail 'pushing unexpected ref' $push_spec HEAD:refs/wombat
 mustfail 'pushing multiple heads' $push_spec HEAD:refs/dgit/wombat
 mustfail 'pushing multiple tags' $push_spec HEAD:refs/tags/debian/wombat
 mustfail 'pushing unexpected ref' $push_spec HEAD:refs/wombat
 mustfail 'pushing multiple heads' $push_spec HEAD:refs/dgit/wombat
 mustfail 'pushing multiple tags' $push_spec HEAD:refs/tags/debian/wombat


@@ -144,11 +139,11 @@ mktag
 mustsucceed $push_spec # succeeds
 
 mktag
 mustsucceed $push_spec # succeeds
 
 mktag

-mustfail 'push is missing head ref update' $push_spec
+mustfail 'push is missing head ref update' $push_spec1 +$push_spec2

 
 git commit --allow-empty -m 'Dummy update'
 mktag
 
 git commit --allow-empty -m 'Dummy update'
 mktag

-mustfail 'not replacing previously-pushed version' $push_spec
+mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2

 git reset --hard HEAD~
 
 prep_dm_mangle () {
 git reset --hard HEAD~
 
 prep_dm_mangle () {