| commit | 4bbb830a35c5134b612a990f04ee16678ec0c674 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 7 Apr 2013 15:45:03 +0000 (7 08:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 7 Apr 2013 15:45:03 +0000 (7 08:45 -0700) | ||
| tree | 5857a31360481265078ae10c2989471137596cd7 | treesnapshot (tar.gz zip) |
| parent | 0e9b327227fb8f7c1e3a5bbaef19e25b4dfd6764 | commitdiff |
| parent | efa5f82540ac0ea75ac185324a78fa230befa050 | commitdiff |
Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1
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
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
| attr.c | diff1 | diff2 | blobhistory |
| dir.c | diff1 | diff2 | blobhistory |