mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

describe: match pattern for lightweight tags too

Browse Source 
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>
This commit is contained in:
Michael Dressel
2008-06-04 21:06:31 +02:00
committed by Junio C Hamano
parent 28bc30220f
commit 4ed19a3c17
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-describe.c
View File

@ -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;