From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Shawn O. Pearce" <spearce@spearce.org>
Subject: Re: [PATCH] describe: match pattern for lightweight tags too
Date: Wed, 4 Jun 2008 15:55:16 -0400
Message-ID: <20080604195516.GT12896@spearce.org>
References: <alpine.LNX.1.10.0806042101080.3410@pollux>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Cc: git@vger.kernel.org
To: Michael Dressel <MichaelTiloDressel@t-online.de>
X-From: git-owner@vger.kernel.org Wed Jun 04 21:56:18 2008
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1K3z5l-0007gH-JB
	for gcvg-git-2@gmane.org; Wed, 04 Jun 2008 21:56:17 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1760182AbYFDTzW (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 4 Jun 2008 15:55:22 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760192AbYFDTzW
	(ORCPT <rfc822;git-outgoing>); Wed, 4 Jun 2008 15:55:22 -0400
Received: from corvette.plexpod.net ([64.38.20.226]:56200 "EHLO
	corvette.plexpod.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1759576AbYFDTzV (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 4 Jun 2008 15:55:21 -0400
Received: from cpe-74-70-48-173.nycap.res.rr.com ([74.70.48.173] helo=asimov.home.spearce.org)
	by corvette.plexpod.net with esmtpa (Exim 4.69)
	(envelope-from <spearce@spearce.org>)
	id 1K3z4g-0000Nw-B6; Wed, 04 Jun 2008 15:55:10 -0400
Received: by asimov.home.spearce.org (Postfix, from userid 1000)
	id 2AA4320FBAE; Wed,  4 Jun 2008 15:55:17 -0400 (EDT)
Content-Disposition: inline
In-Reply-To: <alpine.LNX.1.10.0806042101080.3410@pollux>
User-Agent: Mutt/1.5.11
X-AntiAbuse: This header was added to track abuse, please include it with any abuse report
X-AntiAbuse: Primary Hostname - corvette.plexpod.net
X-AntiAbuse: Original Domain - vger.kernel.org
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - spearce.org
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/83815>

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.