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: break out t-prep-newpackage (nfc)
[dgit.git]
/
tests
/
tests
/
push-newpackage
diff --git
a/tests/tests/push-newpackage
b/tests/tests/push-newpackage
index eea5685a359a65bbc9e2413430c47adcffdf7da9..5d23faa8312cfaeba869a5ea7d50a57da1aa8fb5 100755
(executable)
--- a/
tests/tests/push-newpackage
+++ b/
tests/tests/push-newpackage
@@
-2,14
+2,9
@@
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
@@
-18,6
+13,17
@@
LANG=C t-dgit push 2>&1 \
| grep 'package appears to be new in this suite' >/dev/null
t-dgit build
| grep 'package appears to be new in this suite' >/dev/null
t-dgit build
+
+git checkout bogus
+
+set +e
+(set -e; DGIT_TEST_DEBUG=' ' t-dgit push --new)
+rc=$?
+set -e
+if [ $rc = 0 ]; then fail "push succeeded when tree mismatch"; fi
+
+git checkout master
+
t-dgit push --new
t-pushed-good master
t-dgit push --new
t-pushed-good master