From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 04 Jun 2008 19:55:16 GMT
Subject: Re: [PATCH] describe: match pattern for lightweight tags too
Message-ID: <20080604195516.GT12896@spearce.org>
In-Reply-To: <alpine.LNX.1.10.0806042101080.3410@pollux>

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.