From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Sep 2017 04:30:01 +0000 (+0900)
Subject: Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-all
X-Git-Tag: v2.15.0-rc0~33^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3445c3dd723b222d5ceda07b13d092d73428012e;p=thirdparty%2Fgit.git

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

3445c3dd723b222d5ceda07b13d092d73428012e
diff --cc builtin/describe.c
index e77163e909,ba4ebb4d1b..3dc1836480
--- a/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? */