提交 f0946cb8 编写于 作者: B Björn Steinbrink 提交者: Junio C Hamano

tree_entry_interesting: a pathspec only matches at directory boundary

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: NBjörn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 5bd27ebb
......@@ -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
......@@ -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? */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册