X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fdrs-push-rejects;h=74ddd37adcc1f9100b5af629016ed4cb4066f253;hb=e852e5f836f1016c9af35d331b6aacb3afe6a488;hp=fdd390dfa837e6f38d71a2098f81fb3be7295656;hpb=4383b44c16571b49dd741987a1dc49d145242039;p=dgit.git

diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index fdd390df..74ddd37a 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -10,21 +10,13 @@ t-worktree drs
 
 cd $p
 
-reporefs () {
-	(set -e
-	if test -d $tmp/git/$p.git; then
-		cd $tmp/git/$p.git
-		git show-ref
-	fi)
-}
-
 mustfail () {
 	local wantmsg="$1"; shift
-	reporefs >$tmp/show-refs.pre-push
-	set +e
+	t-reporefs >$tmp/show-refs.pre-push
+	set +o pipefail
 	git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
 	ps="${PIPESTATUS[*]}"
-	set -e
+	set -o pipefail
 	case $ps in
 	"0 0")	fail "push unexpectedly succeeded (instead of: $wantmsg)" ;;
 	*" 0")	;;
@@ -33,14 +25,14 @@ mustfail () {
 	if ! fgrep "$wantmsg" $tmp/mustfail.txt >/dev/null; then
 		fail "error message not found"
 	fi
-	reporefs >$tmp/show-refs.post-push
+	t-reporefs >$tmp/show-refs.post-push
 	diff $tmp/show-refs.{pre,post}-push
 }
 
 mustsucceed () {
-	reporefs >$tmp/show-refs.pre-push
+	t-reporefs >$tmp/show-refs.pre-push
 	git push origin "$@"
-	reporefs >$tmp/show-refs.post-push
+	t-reporefs >$tmp/show-refs.post-push
 	if diff $tmp/show-refs.{pre,post}-push >$tmp/show-refs.diff; then
 		fail "no refs updated"
 	fi
@@ -86,7 +78,7 @@ for h in object type tag; do
     cat badtag.asc >>badtag
 
     set +e
-    LC_ALL=C git hash-object -w -t tag badtag >badtag.hash 2>badtag.err
+    LC_MESSAGES=C git hash-object -w -t tag badtag >badtag.hash 2>badtag.err
     rc=$?
     set -e
 
@@ -128,6 +120,7 @@ prep unstable sid
 mktag
 echo woody >$tmp/suites
 mustfail 'unknown suite' $push_spec
+cp $root/tests/suites $tmp/.
 
 # fixme:
 #    or reject "command string not understood";
@@ -158,8 +151,13 @@ prep unstable sid
 mktag
 mustsucceed $push_spec # succeeds
 
+mktag
+mustfail 'push is missing head ref update' $push_spec
+
+git commit --allow-empty -m 'Dummy update'
 mktag
 mustfail 'not replacing previously-pushed version' $push_spec
+git reset --hard HEAD~
 
 prep_dm_mangle () {
 	prep unstable sid