chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-maint-gbp(7): Mention --overwrite
[dgit.git]
/
tests
/
tests
/
drs-push-rejects
diff --git
a/tests/tests/drs-push-rejects
b/tests/tests/drs-push-rejects
index 6f2797a04fbbb49bffefc4b99278657bc3f3cbca..f87cbdcbefc5f873b32c74b3b36e830534c30dae 100755
(executable)
--- a/
tests/tests/drs-push-rejects
+++ b/
tests/tests/drs-push-rejects
@@
-27,10
+27,13
@@
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]"
+ re-prep
+}
+re-prep () {
tag_name=$tagpfx/$version
push_spec1="HEAD:refs/dgit/$csuite"
push_spec2="refs/tags/$tag_name"
tag_name=$tagpfx/$version
push_spec1="HEAD:refs/dgit/$csuite"
push_spec2="refs/tags/$tag_name"
@@
-146,6
+149,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
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 () {
git reset --hard HEAD~
prep_dm_mangle () {