summaryrefslogtreecommitdiff
path: root/tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-02 02:34:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-02 02:35:31 (GMT)
commit8092bfb6c23776d72ce4b38a3b517c3753c3b9fe (patch)
tree1bb24e2b99a36d5b58aedb9805e663c5d11b1569 /tree.c
parentf0946cb826b9b6c01976860fdd9dfd498ce0ec5e (diff)
downloadgit-8092bfb6c23776d72ce4b38a3b517c3753c3b9fe.zip
git-8092bfb6c23776d72ce4b38a3b517c3753c3b9fe.tar.gz
git-8092bfb6c23776d72ce4b38a3b517c3753c3b9fe.tar.bz2
match_tree_entry(): a pathspec only matches at directory boundaries
Previously the code did a simple prefix match, which means that a path in a directory "frotz/" would have matched with pathspec "f". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree.c')
-rw-r--r--tree.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/tree.c b/tree.c
index 03e782a..d82a047 100644
--- a/tree.c
+++ b/tree.c
@@ -60,8 +60,12 @@ static int match_tree_entry(const char *base, int baselen, const char *path, uns
/* If it doesn't match, move along... */
if (strncmp(base, match, matchlen))
continue;
- /* The base is a subdirectory of a path which was specified. */
- return 1;
+ /* pathspecs match only at the directory boundaries */
+ if (!matchlen ||
+ base[matchlen] == '/' ||
+ match[matchlen - 1] == '/')
+ return 1;
+ continue;
}
/* Does the base match? */