summaryrefslogtreecommitdiff
path: root/tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-21 00:00:40 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-21 00:00:40 -0700
commit062868cc003d5952f11c7c9cd3940ae7d675960a (patch)
treee8e3310849fe470972980cc983f8420cf867bdcf /tree.c
parentfe3420b616eba8027b080dc81020b0e0990f4809 (diff)
parent3ac3cfb8ebd66ff57ba5e316abddc9612e7b485e (diff)
downloadgit-062868cc003d5952f11c7c9cd3940ae7d675960a.tar.gz
Merge branch 'maint'
* maint: gitcvs-migration: Link to git-cvsimport documentation Fix off-by-one in read_tree_recursive
Diffstat (limited to 'tree.c')
-rw-r--r--tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tree.c b/tree.c
index 0d703a0c47..5ab90af256 100644
--- a/tree.c
+++ b/tree.c
@@ -62,6 +62,7 @@ static int match_tree_entry(const char *base, int baselen, const char *path, uns
continue;
/* pathspecs match only at the directory boundaries */
if (!matchlen ||
+ baselen == matchlen ||
base[matchlen] == '/' ||
match[matchlen - 1] == '/')
return 1;