diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-07 08:45:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-07 08:45:03 -0700 |
| commit | 4bbb830a35c5134b612a990f04ee16678ec0c674 (patch) | |
| tree | 5857a31360481265078ae10c2989471137596cd7 /mergetools/codecompare | |
| parent | remote-helpers/test-bzr.sh: do not use "grep '\s'" (diff) | |
| parent | t: check that a pattern without trailing slash matches a directory (diff) | |
| download | tgif-4bbb830a35c5134b612a990f04ee16678ec0c674.tar.xz | |
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
Diffstat (limited to 'mergetools/codecompare')
0 files changed, 0 insertions, 0 deletions