Merge branch 'nd/wildmatch'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 21:47:15 +0000 (13:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 21:47:20 +0000 (13:47 -0800)
commit2adf7247ec1f82032f52682918c200716145bffd
tree2af5f520d874aa11b668138aebecce58da3256eb
parent4249d850cff0d1d36b3a9c4cf38066c50365cfd1
parentb6a3d3353f799c8c5afedb2da4df6e7cdc5d00c9
Merge branch 'nd/wildmatch'

Allows pathname patterns in .gitignore and .gitattributes files
with double-asterisks "foo/**/bar" to match any number of directory
hierarchies.

* nd/wildmatch:
  wildmatch: replace variable 'special' with better named ones
  compat/fnmatch: respect NO_FNMATCH* even on glibc
  wildmatch: fix "**" special case
  t3070: Disable some failing fnmatch tests
  test-wildmatch: avoid Windows path mangling
  Support "**" wildcard in .gitignore and .gitattributes
  wildmatch: make /**/ match zero or more directories
  wildmatch: adjust "**" behavior
  wildmatch: fix case-insensitive matching
  wildmatch: remove static variable force_lower_case
  wildmatch: make wildmatch's return value compatible with fnmatch
  t3070: disable unreliable fnmatch tests
  Integrate wildmatch to git
  wildmatch: follow Git's coding convention
  wildmatch: remove unnecessary functions
  Import wildmatch from rsync
  ctype: support iscntrl, ispunct, isxdigit and isprint
  ctype: make sane_ctype[] const array

Conflicts:
Makefile
.gitignore
Documentation/gitignore.txt
Makefile
compat/fnmatch/fnmatch.c
dir.c
git-compat-util.h
t/t0003-attributes.sh