chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: do not add -i in default invocation
[dgit.git]
/
tests
/
tests
/
drs-push-rejects
diff --git
a/tests/tests/drs-push-rejects
b/tests/tests/drs-push-rejects
index 13567c3f3a7b771ca235af9589fdb5f8524310aa..afaed4cf248cb0c76f4f2bd6166379159655d089 100755
(executable)
--- a/
tests/tests/drs-push-rejects
+++ b/
tests/tests/drs-push-rejects
@@
-5,20
+5,18
@@
set -e
t-drs
t-git-none
t-drs
t-git-none
-
p=
pari-extra
+
t-select-package
pari-extra
t-worktree drs
cd $p
t-worktree drs
cd $p
+git remote set-url origin \
+ "ext::$troot/drs-git-ext %S /pari-extra.git"
+
mustfail () {
local mpat="$1"; shift
mustfail () {
local mpat="$1"; shift
- t-reporefs pre-push
-
- t-expect-fail "$mpat" \
- git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
-
- t-reporefs post-push
- diff $tmp/show-refs.{pre,post}-push
+ t-expect-push-fail "$mpat" \
+ git push origin "$@"
}
mustsucceed () {
}
mustsucceed () {
@@
-32,16
+30,20
@@
mustsucceed () {
prep () {
local suite=$1
prep () {
local suite=$1
-
local
csuite=$2
+ csuite=$2
cp $tmp/masters/* $tmp/.
tag_signer='-u Senatus'
tag_message="$p release $version for $suite ($csuite) [dgit]"
cp $tmp/masters/* $tmp/.
tag_signer='-u Senatus'
tag_message="$p release $version for $suite ($csuite) [dgit]"
- tag_name=debian/$version
+ re-prep
+}
+re-prep () {
+ tag_name=$tagpfx/$version
push_spec1="HEAD:refs/dgit/$csuite"
push_spec2="refs/tags/$tag_name"
push_spec="$push_spec1 $push_spec2"
}
mktag () {
push_spec1="HEAD:refs/dgit/$csuite"
push_spec2="refs/tags/$tag_name"
push_spec="$push_spec1 $push_spec2"
}
mktag () {
+ t-git-next-date
git tag -f $tag_signer -m "$tag_message" $tag_name "$@"
}
git tag -f $tag_signer -m "$tag_message" $tag_name "$@"
}
@@
-85,6
+87,8
@@
for h in object type tag; do
git update-ref refs/tags/$tag_name $badtag
mustfail 'multiple headers '$h' in signed tag object' $push_spec
git update-ref refs/tags/$tag_name $badtag
mustfail 'multiple headers '$h' in signed tag object' $push_spec
+
+ t-expect-fsck-fail $badtag
done
done
done
done
@@
-103,10
+107,11
@@
mustfail 'sid != sponge' HEAD:refs/dgit/sponge $push_spec2
prep unstable sid
mktag
mustfail 'push is missing tag ref update' $push_spec1
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 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
+mustfail E:'pushing multiple tags|pushing too many similar tags' \
+ $push_spec HEAD:refs/tags/$tagpfx/wombat
prep unstable sid
mktag
prep unstable sid
mktag
@@
-133,22
+138,35
@@
mktag HEAD~:
mustfail 'tag refers to wrong kind of object' $push_spec
prep unstable sid
mustfail 'tag refers to wrong kind of object' $push_spec
prep unstable sid
-tag_name=
debian
/wombat
+tag_name=
$tagpfx
/wombat
mktag
mktag
-#git update-ref
debian/$version debian
/wombat
+#git update-ref
$tagpfx/$version $tagpfx
/wombat
mustfail 'tag name in tag is wrong' \
mustfail 'tag name in tag is wrong' \
- refs/tags/debian/wombat:refs/tags/debian/$version $push_spec1
+ refs/tags/$tagpfx/wombat:refs/tags/$tagpfx/$version $push_spec1
+
+t-make-badcommit
+git checkout -b broken $badcommit
+prep unstable sid
+mktag
+mustfail "corrupted object $badcommit" $push_spec
+git checkout dgit/sid
prep unstable sid
mktag
mustsucceed $push_spec # succeeds
mktag
prep unstable sid
mktag
mustsucceed $push_spec # succeeds
mktag
-mustfail 'push is missing head ref update' $push_spec
+mustfail 'push is missing head ref update' $push_spec
1 +$push_spec2
git commit --allow-empty -m 'Dummy update'
mktag
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
+
+t-newtag
+re-prep
+mktag
+mustfail 'not replacing previously-pushed version' +$push_spec1 +$push_spec2
+
git reset --hard HEAD~
prep_dm_mangle () {
git reset --hard HEAD~
prep_dm_mangle () {
@@
-185,4
+203,4
@@
mustfail "not in permissions list although in keyring" $push_spec
prep_dm_mangle ''
mustsucceed $push_spec # succeeds
prep_dm_mangle ''
mustsucceed $push_spec # succeeds
-echo ok.
+t-ok