Subject: [PATCH 1/2] Fix minor issue with t6120-describe.

From: "Shawn O. Pearce" <[email-masked]>
Date: Sun, 14 Jan 2007 04:37:01 -0500

The tests for B wind up matching exactly, as in the test repository
B is exactly HEAD^^2^.  So we cannot match on B-* as we will never
get additional SHA1 data appended to the tag name.

Signed-off-by: Shawn O. Pearce <[email-masked]>
---
 t/t6120-describe.sh |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index e6c6160..3e9edda 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -18,8 +18,8 @@ check_describe () {
 	R=$(git describe "$@") &&
 	test_expect_success "describe $*" '
 	case "$R" in
-	"$expect"-*)	echo happy ;;
-	*)	echo "Oops - $R??? expected $expect";
+	$expect)	echo happy ;;
+	*)	echo "Oops - $R is not $expect";
 		false ;;
 	esac
 	'
@@ -82,16 +82,16 @@ test_expect_success setup '
 
 '
 
-check_describe A HEAD
-check_describe A HEAD^
-check_describe D HEAD^^
-check_describe A HEAD^^2
+check_describe A-* HEAD
+check_describe A-* HEAD^
+check_describe D-* HEAD^^
+check_describe A-* HEAD^^2
 check_describe B HEAD^^2^
 
-check_describe A --tags HEAD
-check_describe A --tags HEAD^
-check_describe D --tags HEAD^^
-check_describe A --tags HEAD^^2
+check_describe A-* --tags HEAD
+check_describe A-* --tags HEAD^
+check_describe D-* --tags HEAD^^
+check_describe A-* --tags HEAD^^2
 check_describe B --tags HEAD^^2^
 
 test_done
-- 
1.5.0.rc1.g4494