summaryrefslogtreecommitdiff
path: root/tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-18 21:18:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-18 21:18:32 (GMT)
commit08e7239c36a477c52ac83488537600a494002b31 (patch)
tree3f0ec5559df41d2d22c86d0aba1415b6f7cb1a44 /tree.c
parentf3924858133dff1e94c992b689fa425a6d27d4fd (diff)
parent8092bfb6c23776d72ce4b38a3b517c3753c3b9fe (diff)
downloadgit-08e7239c36a477c52ac83488537600a494002b31.zip
git-08e7239c36a477c52ac83488537600a494002b31.tar.gz
git-08e7239c36a477c52ac83488537600a494002b31.tar.bz2
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint
* bs/maint-1.6.0-tree-walk-prefix: match_tree_entry(): a pathspec only matches at directory boundaries tree_entry_interesting: a pathspec only matches at directory boundary
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 25d2e29..0d703a0 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? */