cd $p
mustfail () {
- local wantmsg="$1"; shift
- t-reporefs >$tmp/show-refs.pre-push
- set +o pipefail
- git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
- ps="${PIPESTATUS[*]}"
- set -o pipefail
- case $ps in
- "0 0") fail "push unexpectedly succeeded (instead of: $wantmsg)" ;;
- *" 0") ;;
- *) fail "tee failed" ;;
- esac
- if ! fgrep "$wantmsg" $tmp/mustfail.txt >/dev/null; then
- fail "error message not found"
- fi
- t-reporefs >$tmp/show-refs.post-push
- diff $tmp/show-refs.{pre,post}-push
+ local mpat="$1"; shift
+ t-expect-push-fail "$mpat" \
+ git push origin "$@"
}
mustsucceed () {
- t-reporefs >$tmp/show-refs.pre-push
+ t-reporefs pre-push
git push origin "$@"
- t-reporefs >$tmp/show-refs.post-push
+ t-reporefs post-push
if diff $tmp/show-refs.{pre,post}-push >$tmp/show-refs.diff; then
fail "no refs updated"
fi
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
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
-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 () {