Skip to content

Commit

Permalink
tree_entry_interesting: a pathspec only matches at directory boundary
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: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Björn Steinbrink authored and Junio C Hamano committed Apr 2, 2009
1 parent 5bd27eb commit f0946cb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
8 changes: 8 additions & 0 deletions t/t4010-diff-pathspec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,12 @@ test_expect_success \
'git diff-index --cached $tree -- file0/ >current &&
compare_diff_raw current expected'

test_expect_success 'diff-tree pathspec' '
tree2=$(git write-tree) &&
echo "$tree2" &&
git diff-tree -r --name-only $tree $tree2 -- pa path1/a >current &&
>expected &&
test_cmp expected current
'

test_done
12 changes: 9 additions & 3 deletions tree-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,16 @@ static int tree_entry_interesting(struct tree_desc *desc, const char *base, int
continue;

/*
* The base is a subdirectory of a path which
* was specified, so all of them are interesting.
* If the base is a subdirectory of a path which
* was specified, all of them are interesting.
*/
return 2;
if (!matchlen ||
base[matchlen] == '/' ||
match[matchlen - 1] == '/')
return 2;

/* Just a random prefix match */
continue;
}

/* Does the base match? */
Expand Down

0 comments on commit f0946cb

Please sign in to comment.