From 79614812a546bd31fcd5cae0d6c1ed0db47b5f83 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 31 May 2015 17:37:57 +0100
Subject: Test suite: Move t-reporefs into lib

---
 tests/lib                    |  8 ++++++++
 tests/tests/drs-push-rejects | 16 ++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/lib b/tests/lib
index cf8b725..5c8293f 100644
--- a/tests/lib
+++ b/tests/lib
@@ -52,6 +52,14 @@ t-expect-fail () {
 	egrep "$mpat" $tmp/t.output ||false
 }
 
+t-reporefs () {
+	(set -e
+	if test -d $tmp/git/$p.git; then
+		cd $tmp/git/$p.git
+		git show-ref |sort
+	fi)
+}
+
 t-untar () {
 	local tarfile=$1.tar
 	local edittree=$1.edit
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 5f6d04a..5b450bf 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -10,17 +10,9 @@ 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
+	t-reporefs >$tmp/show-refs.pre-push
 	set +e
 	git push origin "$@" 2>&1 |tee $tmp/mustfail.txt
 	ps="${PIPESTATUS[*]}"
@@ -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
-- 
cgit v1.2.3