Skip to content

Commit

Permalink
match_tree_entry(): a pathspec only matches at directory boundaries
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
gitster committed Apr 2, 2009
1 parent f0946cb commit 8092bfb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
6 changes: 6 additions & 0 deletions t/t3101-ls-tree-dirname.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 6 additions & 2 deletions tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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? */
Expand Down

0 comments on commit 8092bfb

Please sign in to comment.