summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-01 19:34:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-01 19:35:31 -0700
commit8092bfb6c23776d72ce4b38a3b517c3753c3b9fe (patch)
tree1bb24e2b99a36d5b58aedb9805e663c5d11b1569
parenttree_entry_interesting: a pathspec only matches at directory boundary (diff)
downloadtgif-8092bfb6c23776d72ce4b38a3b517c3753c3b9fe.tar.xz
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>
-rwxr-xr-xt/t3101-ls-tree-dirname.sh6
-rw-r--r--tree.c8
2 files changed, 12 insertions, 2 deletions
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 4dd7d12bac..51cb4a30f5 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -135,4 +135,10 @@ test_expect_success \
EOF
test_output'
+test_expect_success 'ls-tree filter is leading path match' '
+ git ls-tree $tree pa path3/a >current &&
+ >expected &&
+ test_output
+'
+
test_done
diff --git a/tree.c b/tree.c
index 03e782a9ca..d82a047e55 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? */