Merge branch 'jk/describe-omit-some-refs' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:01 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:01 +0000 (14:19 +0900)
commit501ec0dad31a5379ac7620f8655de882844fd3c1
treef70bdfbae0b2f99e4aa1b278bd22b72609c3487c
parent8dc1d0bf64ce84030a1a13ea64343f816dba9e27
parentda769d2986470931b8e80b8d14afcae3d7cc20d7
Merge branch 'jk/describe-omit-some-refs' into maint

"git describe --match" learned to take multiple patterns in v2.13
series, but the feature ignored the patterns after the first one
and did not work at all.  This has been fixed.

* jk/describe-omit-some-refs:
  describe: fix matching to actually match all patterns
builtin/describe.c
t/t6120-describe.sh