Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

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

From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:44:41

Michael Dressel [off-list ref] 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 <redacted>
Acked-by: Shawn O. Pearce <redacted>
quoted hunk ↗ jump to hunk
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help