[PATCH] describe match pattern for soft tags too

[PATCH] describe match pattern for soft tags too

[Michael Dressel]

So far git describe --match <pattern> would apply the <pattern> only
to tag objects not to soft tags. This change make describe apply
the <pattern> to soft tags too.
---
  builtin-describe.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin-describe.c b/builtin-describe.c
index df554b3..a1b8251 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -82,10 +82,10 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void
  	if (might_be_tag) {
  		if (is_tag) {
  			prio = 2;
-			if (pattern && fnmatch(pattern, path + 10, 0))
-				prio = 0;
  		} 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 soft tags too

[Johannes Schindelin]

Hi,

On Tue, 3 Jun 2008, Michael Dressel wrote:

> So far git describe --match <pattern> would apply the <pattern> only
> to tag objects not to soft tags.

And I thought that was what --tags was for.

Ciao,
Dscho

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

[Shawn O. Pearce]

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Tue, 3 Jun 2008, Michael Dressel wrote:
> 
> > So far git describe --match <pattern> would apply the <pattern> only
> > to tag objects not to soft tags.
> 
> And I thought that was what --tags was for.

Yes.  However there is a bug in git-describe's implementation;
--match only tested on annotated tags.  The test was buried inside
of the block that handles the annotated case.  Michael's patch pulls
this test outside where it can apply to lightweight tags when --tags
is included on the command line.

-- 
Shawn.

Re: [PATCH] describe match pattern for soft 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 soft tags. This change make describe apply
> the <pattern> to soft tags too.

Whoops.

Signed-off-by tag?

Assuming you supply Junio an SBO tag,

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

> ---
>  builtin-describe.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/builtin-describe.c b/builtin-describe.c
> index df554b3..a1b8251 100644
> --- a/builtin-describe.c
> +++ b/builtin-describe.c
> @@ -82,10 +82,10 @@ static int get_name(const char *path, const unsigned 
> char *sha1, int flag, void
>  	if (might_be_tag) {
>  		if (is_tag) {
>  			prio = 2;
> -			if (pattern && fnmatch(pattern, path + 10, 0))
> -				prio = 0;
>  		} else
>  			prio = 1;
> +		if (pattern && fnmatch(pattern, path + 10, 0))
> +			prio = 0;
>  	}
>  	else
>  		prio = 0;

-- 
Shawn.

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

[Junio C Hamano]

"Shawn O. Pearce" <spearce@spearce.org> writes:

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

Micronit.  They are called "lightweight" tags.  There aren't any hard tags
either.

> Signed-off-by tag?
>
> Assuming you supply Junio an SBO tag,
>
> Acked-by: Shawn O. Pearce <spearce@spearce.org>

Thanks for proofreading.

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

[Michael Dressel]

On Tue, 3 Jun 2008, Junio C Hamano wrote:

> "Shawn O. Pearce" <spearce@spearce.org> writes:
>
>> Michael Dressel <MichaelTiloDressel@t-online.de> wrote:
>>>
>>> So far git describe --match <pattern> would apply the <pattern> only
>>> to tag objects not to soft tags. This change make describe apply
>>> the <pattern> to soft tags too.
>>
>> Whoops.
>
> Micronit.  They are called "lightweight" tags.  There aren't any hard tags
> either.
>
>> Signed-off-by tag?
>>
>> Assuming you supply Junio an SBO tag,
>>
>> Acked-by: Shawn O. Pearce <spearce@spearce.org>
>
> Thanks for proofreading.

Thanks for the comments.
I will sent in a new patch see:

[PATCH] describe: match pattern for lightweight tags too

Cheers,
Michael