chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: Test that --deliberately-not-fast-forward only works duuring NEW phase
[dgit.git]
/
tests
/
tests
/
push-newpackage
diff --git
a/tests/tests/push-newpackage
b/tests/tests/push-newpackage
index 030507f15a6ca171298441c8c938ae5fb3a6a9ca..d0f3f35a40d9927af72afb01fd3aa5c729836046 100755
(executable)
--- a/
tests/tests/push-newpackage
+++ b/
tests/tests/push-newpackage
@@
-2,27
+2,21
@@
set -e
. tests/lib
set -e
. tests/lib
-t-archive-none pari-extra
-t-git-none
-t-worktree 3-1
-v=3-1
-cd $p
-git branch -m dgit/sid master
-git remote rm dgit
+t-prep-newpackage pari-extra 3-1
+cd $p
t-refs-same-start
t-ref-head
t-refs-same-start
t-ref-head
-LANG=C t-dgit push 2>&1 \
- | tee /dev/stderr \
- | grep 'package appears to be new in this suite' >/dev/null
+t-expect-push-fail 'package appears to be new in this suite' \
+t-dgit push
t-dgit build
git checkout bogus
set +e
t-dgit build
git checkout bogus
set +e
-(set -e; t-dgit push --new)
+(set -e;
DGIT_TEST_DEBUG=' '
t-dgit push --new)
rc=$?
set -e
if [ $rc = 0 ]; then fail "push succeeded when tree mismatch"; fi
rc=$?
set -e
if [ $rc = 0 ]; then fail "push succeeded when tree mismatch"; fi