[PATCH] describe: match pattern for lightweight tags too

[PATCH] describe: match pattern for lightweight tags too

[Michael Dressel]

So far git describe --match <pattern> would apply the <pattern> only
to tag objects not to lightweight tags. This change make describe apply
the <pattern> to lightweight tags too.

Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de>
---
  builtin-describe.c |    9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/builtin-describe.c b/builtin-describe.c
index df554b3..3da99c1 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -80,12 +80,13 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void
  	 * Otherwise only annotated tags are used.
  	 */
  	if (might_be_tag) {
-		if (is_tag) {
+		if (is_tag)
  			prio = 2;
-			if (pattern && fnmatch(pattern, path + 10, 0))
-				prio = 0;
-		} else
+		else
  			prio = 1;
+
+		if (pattern && fnmatch(pattern, path + 10, 0))
+			prio = 0;
  	}
  	else
  		prio = 0;
-- 
1.5.5.3

Re: [PATCH] describe: match pattern for lightweight tags too

[Shawn O. Pearce]

Michael Dressel <MichaelTiloDressel@t-online.de> wrote:
> 
> So far git describe --match <pattern> would apply the <pattern> only
> to tag objects not to lightweight tags. This change make describe apply
> the <pattern> to lightweight tags too.
> 
> Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de>

Acked-by: Shawn O. Pearce <spearce@spearce.org>

> diff --git a/builtin-describe.c b/builtin-describe.c
> index df554b3..3da99c1 100644
> --- a/builtin-describe.c
> +++ b/builtin-describe.c
> @@ -80,12 +80,13 @@ static int get_name(const char *path, const unsigned 
> char *sha1, int flag, void
>  	 * Otherwise only annotated tags are used.
>  	 */
>  	if (might_be_tag) {
> -		if (is_tag) {
> +		if (is_tag)
>  			prio = 2;
> -			if (pattern && fnmatch(pattern, path + 10, 0))
> -				prio = 0;
> -		} else
> +		else
>  			prio = 1;
> +
> +		if (pattern && fnmatch(pattern, path + 10, 0))
> +			prio = 0;
>  	}
>  	else
>  		prio = 0;

-- 
Shawn.

Re: [PATCH] describe: match pattern for lightweight tags too

[Junio C Hamano]

Thanks both.  I've reworded the log message to make it clear that this is
not a random new feature but is a bugfix.

-- >8 --
From: Michael Dressel <MichaelTiloDressel@t-online.de>
Date: Wed, 4 Jun 2008 21:06:31 +0200
Subject: [PATCH] describe: match pattern for lightweight tags too

The <pattern> given "git describe --match" was used only to filter tag
objects, and not to filter lightweight tags.  This fixes it.

[jc: made the log to clarify this is a bugfix, not an enhancement, with
additional test]

Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin-describe.c  |    9 +++++----
 t/t6120-describe.sh |   22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/builtin-describe.c b/builtin-describe.c
index df554b3..3da99c1 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -80,12 +80,13 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void
 	 * Otherwise only annotated tags are used.
 	 */
 	if (might_be_tag) {
-		if (is_tag) {
+		if (is_tag)
 			prio = 2;
-			if (pattern && fnmatch(pattern, path + 10, 0))
-				prio = 0;
-		} else
+		else
 			prio = 1;
+
+		if (pattern && fnmatch(pattern, path + 10, 0))
+			prio = 0;
 	}
 	else
 		prio = 0;
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 56bbd85..c6bfef5 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -117,4 +117,26 @@ test_expect_success 'rename tag Q back to A' '
 test_expect_success 'pack tag refs' 'git pack-refs'
 check_describe A-* HEAD
 
+test_expect_success 'set-up matching pattern tests' '
+	git tag -a -m test-annotated test-annotated &&
+	echo >>file &&
+	test_tick &&
+	git commit -a -m "one more" &&
+	git tag test1-lightweight &&
+	echo >>file &&
+	test_tick &&
+	git commit -a -m "yet another" &&
+	git tag test2-lightweight &&
+	echo >>file &&
+	test_tick &&
+	git commit -a -m "even more"
+
+'
+
+check_describe "test-annotated-*" --match="test-*"
+
+check_describe "test1-lightweight-*" --tags --match="test1-*"
+
+check_describe "test2-lightweight-*" --tags --match="test2-*"
+
 test_done
-- 
1.5.6.rc1.5.gadf60