chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: start 9.14
[dgit.git]
/
tests
/
tests
/
drs-push-rejects
diff --git
a/tests/tests/drs-push-rejects
b/tests/tests/drs-push-rejects
index 8c4ad83cd75acee8b65d289d287404e8f4f05768..f102d9537efc1b84d1191a827e826eb5a90c35c7 100755
(executable)
--- a/
tests/tests/drs-push-rejects
+++ b/
tests/tests/drs-push-rejects
@@
-10,6
+10,9
@@
t-worktree drs
cd $p
cd $p
+git remote set-url origin \
+ "ext::$troot/drs-git-ext %S /pari-extra.git"
+
mustfail () {
local mpat="$1"; shift
t-expect-push-fail "$mpat" \
mustfail () {
local mpat="$1"; shift
t-expect-push-fail "$mpat" \
@@
-107,7
+110,7
@@
mustfail 'push is missing tag ref update' $push_spec1
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 '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 E:'pushing multiple tags|pushing too many similar tags' \
+mustfail E:'pushing multiple tags|pushing too many similar tags
|need exactly one archive
' \
$push_spec HEAD:refs/tags/$tagpfx/wombat
prep unstable sid
$push_spec HEAD:refs/tags/$tagpfx/wombat
prep unstable sid
@@
-141,13
+144,7
@@
mktag
mustfail 'tag name in tag is wrong' \
refs/tags/$tagpfx/wombat:refs/tags/$tagpfx/$version $push_spec1
mustfail 'tag name in tag is wrong' \
refs/tags/$tagpfx/wombat:refs/tags/$tagpfx/$version $push_spec1
-echo ====
-badcommit=$(
- git cat-file commit HEAD | \
- perl -pe 's/^committer.*\n//' | \
- git hash-object -w -t commit --stdin
-)
-t-expect-fsck-fail $badcommit
+t-make-badcommit
git checkout -b broken $badcommit
prep unstable sid
mktag
git checkout -b broken $badcommit
prep unstable sid
mktag
@@
-165,7
+162,6
@@
git commit --allow-empty -m 'Dummy update'
mktag
mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
mktag
mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
-t-newtag
re-prep
mktag
mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
re-prep
mktag
mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2