diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-11-09 17:45:16 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-11-09 17:45:16 (GMT) |
commit | 6f10c4103dc7506623f89520ad03517b40788259 (patch) | |
tree | 76db51024713f6ef191928a8445d48d39ab55434 /dir.c | |
parent | 3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e (diff) | |
parent | 60aa9cf8f370b69eb7feaad2e1cbcd04280bc799 (diff) | |
download | git-6f10c4103dc7506623f89520ad03517b40788259.zip git-6f10c4103dc7506623f89520ad03517b40788259.tar.gz git-6f10c4103dc7506623f89520ad03517b40788259.tar.bz2 |
Merge branch 'maint'
* maint:
Documentation: document show -s
dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkout
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -360,7 +360,8 @@ int excluded_from_list(const char *pathname, if (x->flags & EXC_FLAG_MUSTBEDIR) { if (!dtype) { - if (!prefixcmp(pathname, exclude)) + if (!prefixcmp(pathname, exclude) && + pathname[x->patternlen] == '/') return to_exclude; else continue; |