Merge branch 'nd/wildmatch' into next
commit510e8df8becb7b07540ef14de25b3d5afe2f5f7a
authorJeff King <peff@peff.net>
Thu, 25 Oct 2012 11:15:42 +0000 (25 07:15 -0400)
committerJeff King <peff@peff.net>
Thu, 25 Oct 2012 11:15:42 +0000 (25 07:15 -0400)
tree2a88d8470a573863c6aa92cc1b0bc6b2b39c0739
parent09f70ce0eae694a67ed0c65e36be508c2d1137a0
parent237ec6e40d4fd1a0190c4ffde6d18278abc5853a
Merge branch 'nd/wildmatch' into next

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

I suspect that this needs to be plugged to pathspec matching code;
otherwise "git log -- 'Docum*/**/*.txt'" would not show the log for
commits that touch Documentation/git.txt, which would be confusing
to the users.

* nd/wildmatch:
  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
dir.c
git-compat-util.h
t/t0003-attributes.sh