Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-all

* jk/describe-omit-some-refs:
  describe: fix matching to actually match all patterns

diff --cc builtin/describe.c
index e77163e,ba4ebb4..3dc1836
--- 1/builtin/describe.c
--- 2/builtin/describe.c
+++ b/builtin/describe.c
@@@ -164,12 -158,14 +165,14 @@@ static int get_name(const char *path, c
                        return 0;
  
                for_each_string_list_item(item, &patterns) {
-                       if (!wildmatch(item->string, path + 10, 0))
 -                      if (!wildmatch(item->string, path + 10, 0, NULL)) {
++                      if (!wildmatch(item->string, path + 10, 0)) {
+                               found = 1;
                                break;
+                       }
+               }
  
-                       /* If we get here, no pattern matched. */
+               if (!found)
                        return 0;
-               }
        }
  
        /* Is it annotated? */

diff --cc t/t6120-describe.sh
Simple merge