Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Apr 2013 15:45:03 +0000 (08:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Apr 2013 15:45:03 +0000 (08:45 -0700)
A pattern "dir" (without trailing slash) in the attributes file
stopped matching a directory "dir" by mistake with an earlier change
that wanted to allow pattern "dir/" to also match.

* jc/directory-attrs-regression-fix:
  t: check that a pattern without trailing slash matches a directory
  dir.c::match_pathname(): pay attention to the length of string parameters
  dir.c::match_pathname(): adjust patternlen when shifting pattern
  dir.c::match_basename(): pay attention to the length of string parameters
  attr.c::path_matches(): special case paths that end with a slash
  attr.c::path_matches(): the basename is part of the pathname

1  2 
attr.c
dir.c

diff --cc attr.c
Simple merge
diff --cc dir.c
Simple merge