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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Michael Dressel <MichaelTiloDressel@xxxxxxxxxxx> 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@xxxxxxxxxxx>

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

> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux