git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH 1/2] Fix minor issue with t6120-describe.
Date: Sun, 14 Jan 2007 04:37:01 -0500	[thread overview]
Message-ID: <20070114093701.GA15007@spearce.org> (raw)

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

                 reply	other threads:[~2007-01-14  9:37 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070114093701.GA15007@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).