From 090061c9889deb61d3f53a3b89b5620fcc0c3a5b Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 May 2013 23:17:37 -0700
Subject: [PATCH] t5801: fix an earlier mismerge

Sorry, I screwed up earlier and ended up adding the same hunk twice
(one in the middle and another at the end).

Move the tests around to have the GPG stuff earlier, and the newer
error message topic at the end.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t5801-remote-helpers.sh | 52 +++++++++++++++++------------------------------
 1 file changed, 19 insertions(+), 33 deletions(-)

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index eb2d34817d..61479c3b16 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -151,6 +151,25 @@ test_expect_success 'push ref with existing object' '
 	compare_refs local dup server dup
 '
 
+test_expect_success GPG 'push signed tag' '
+	(cd local &&
+	git checkout master &&
+	git tag -s -m signed-tag signed-tag &&
+	git push origin signed-tag
+	) &&
+	compare_refs local signed-tag^{} server signed-tag^{} &&
+	test_must_fail compare_refs local signed-tag server signed-tag
+'
+
+test_expect_success GPG 'push signed tag with signed-tags capability' '
+	(cd local &&
+	git checkout master &&
+	git tag -s -m signed-tag signed-tag-2 &&
+	GIT_REMOTE_TESTGIT_SIGNED_TAGS=1 git push origin signed-tag-2
+	) &&
+	compare_refs local signed-tag-2 server signed-tag-2
+'
+
 test_expect_success 'push update refs' '
 	(cd local &&
 	git checkout -b update master &&
@@ -197,37 +216,4 @@ test_expect_success 'push messages' '
 	)
 '
 
-test_expect_success GPG 'push signed tag' '
-	(cd local &&
-	git checkout master &&
-	git tag -s -m signed-tag signed-tag &&
-	git push origin signed-tag
-	) &&
-	compare_refs local signed-tag^{} server signed-tag^{} &&
-	test_must_fail compare_refs local signed-tag server signed-tag
-'
-
-test_expect_success GPG 'push signed tag with signed-tags capability' '
-	(cd local &&
-	git checkout master &&
-	git tag -s -m signed-tag signed-tag-2 &&
-	GIT_REMOTE_TESTGIT_SIGNED_TAGS=1 git push origin signed-tag-2
-	) &&
-	compare_refs local signed-tag-2 server signed-tag-2
-'
-
-test_expect_success 'push messages' '
-	(cd local &&
-	git checkout -b new_branch master &&
-	echo new >>file &&
-	git commit -a -m new &&
-	git push origin new_branch &&
-	git fetch origin &&
-	echo new >>file &&
-	git commit -a -m new &&
-	git push origin new_branch 2> msg &&
-	! grep "\[new branch\]" msg
-	)
-'
-
 test_done
-- 
2.11.4.GIT