All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] Fix minor issue with t6120-describe.
@ 2007-01-14  9:37 Shawn O. Pearce
  0 siblings, 0 replies; only message in thread
From: Shawn O. Pearce @ 2007-01-14  9:37 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

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 <spearce@spearce.org>
---
 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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2007-01-14  9:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-14  9:37 [PATCH 1/2] Fix minor issue with t6120-describe Shawn O. Pearce

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.