undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/tree-walk-path-exclusion'

Browse Source 
Pathspec matching against a tree object were buggy when negative
pathspec elements were involved, which has been fixed.

* nd/tree-walk-path-exclusion:
  tree-walk.c: fix overoptimistic inclusion in :(exclude) matching
This commit is contained in:
Junio C Hamano 2018-11-13 22:37:28 +09:00
commit 1e4a714e68
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
t/t6132-pathspec-exclude.sh
View File

@ -194,4 +194,21 @@ test_expect_success 'multiple exclusions' '
test_cmp expect actual
'
test_expect_success 't_e_i() exclude case #8' '
git init case8 &&
(
cd case8 &&
echo file >file1 &&
echo file >file2 &&
git add file1 file2 &&
git commit -m twofiles &&
git grep -l file HEAD :^file2 >actual &&
echo HEAD:file1 >expected &&
test_cmp expected actual &&
git grep -l file HEAD :^file1 >actual &&
echo HEAD:file2 >expected &&
test_cmp expected actual
)
'
test_done

11
tree-walk.c
View File

@ -1107,7 +1107,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
* 5 | file | 1 | 1 | 0
* 6 | file | 1 | 2 | 0
* 7 | file | 2 | -1 | 2
* 8 | file | 2 | 0 | 2
* 8 | file | 2 | 0 | 1
* 9 | file | 2 | 1 | 0
* 10 | file | 2 | 2 | -1
* -----+-------+----------+----------+-------
@ -1118,7 +1118,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
* 15 | dir | 1 | 1 | 1 (*)
* 16 | dir | 1 | 2 | 0
* 17 | dir | 2 | -1 | 2
* 18 | dir | 2 | 0 | 2
* 18 | dir | 2 | 0 | 1
* 19 | dir | 2 | 1 | 1 (*)
* 20 | dir | 2 | 2 | -1
*
@ -1134,7 +1134,12 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
negative = do_match(entry, base, base_offset, ps, 1);
/* #3, #4, #7, #8, #13, #14, #17, #18 */
/* #8, #18 */
if (positive == all_entries_interesting &&
negative == entry_not_interesting)
return entry_interesting;
/* #3, #4, #7, #13, #14, #17 */
if (negative <= entry_not_interesting)
return positive;