mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'as/tree-walk-fix-aggressive-short-cut'
* as/tree-walk-fix-aggressive-short-cut: tree_entry_interesting: match against all pathspecs
This commit is contained in:
commit
8bba7206b5
|
@ -127,4 +127,17 @@ test_expect_success 'diff-tree ignores trailing slash on submodule path' '
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'diff multiple wildcard pathspecs' '
|
||||
mkdir path2 &&
|
||||
echo rezrov >path2/file1 &&
|
||||
git update-index --add path2/file1 &&
|
||||
tree3=`git write-tree` &&
|
||||
git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual &&
|
||||
cat <<-\EOF >expect &&
|
||||
path1/file1
|
||||
path2/file1
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
@ -749,7 +749,7 @@ static enum interesting do_match(const struct name_entry *entry,
|
|||
|
||||
if (item->nowildcard_len &&
|
||||
!match_wildcard_base(item, base_str, baselen, &matched))
|
||||
return entry_not_interesting;
|
||||
continue;
|
||||
|
||||
/*
|
||||
* Concatenate base and entry->path into one and do
|
||||
|
|
Loading…
Reference in a new issue