X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fdrs-push-rejects;h=79d02b225738514635d629da4d9c17f0e87ca530;hb=e3d689abb4446aa168d150d2832fe9fd76933dcc;hp=6f2797a04fbbb49bffefc4b99278657bc3f3cbca;hpb=ff53225eafcc9e53998f9f49085a366f3f98fc9c;p=dgit.git

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 6f2797a0..79d02b22 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -27,10 +27,13 @@ mustsucceed () {
 
 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]"
+	re-prep
+}
+re-prep () {
 	tag_name=$tagpfx/$version
 	push_spec1="HEAD:refs/dgit/$csuite"
 	push_spec2="refs/tags/$tag_name"
@@ -81,6 +84,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
+
+    expect_fsck_fail+=" $badtag"
   done
 done
 
@@ -136,6 +141,19 @@ mktag
 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
+)
+expect_fsck_fail+=" $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
@@ -146,6 +164,12 @@ mustfail 'push is missing head ref update' $push_spec1 +$push_spec2
 git commit --allow-empty -m 'Dummy update'
 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
+
 git reset --hard HEAD~
 
 prep_dm_mangle () {
@@ -182,4 +206,4 @@ mustfail "not in permissions list although in keyring" $push_spec
 prep_dm_mangle ''
 mustsucceed $push_spec # succeeds
 
-echo ok.
+t-ok