Merge in 1.6.5.4

diff --git a/builtin-describe.c b/builtin-describe.c
index d4efb10ddfddedb1671fa91130e5fe78400ad154..71be2a9364748668996696f6c74057dba43315b5 100644 (file)
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -200,7 +200,7 @@ static void describe(const char *arg, int last_one)
                die("%s is not a valid '%s' object", arg, commit_type);
 
        n = cmit->util;
-       if (n) {
+       if (n && (tags || all || n->prio == 2)) {
                /*
                 * Exact match to an existing ref.
                 */