chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New dgit-infrastructure binary package containing dgit-repos-server et al. Client...
[dgit.git]
/
tests
/
tests
/
push-newpackage
diff --git
a/tests/tests/push-newpackage
b/tests/tests/push-newpackage
index 3dfe0b58fadaa137c2142f98a82af85059fb8a84..9954b3fc9fb424cc9a763fc795bced4743812210 100755
(executable)
--- a/
tests/tests/push-newpackage
+++ b/
tests/tests/push-newpackage
@@
-10,13
+10,25
@@
cd $p
git branch -m dgit/sid master
git remote rm dgit
git branch -m dgit/sid master
git remote rm dgit
+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
LANG=C t-dgit push 2>&1 \
| tee /dev/stderr \
| grep 'package appears to be new in this suite' >/dev/null
-echo y
-
t-dgit build
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