kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'nd/negative-pathspec' 

* nd/negative-pathspec:
  tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()
maint
Junio C Hamano 2014-01-27 10:45:43 -08:00
parent 523f0a25b9 74b4f7f277
commit 017f804efc
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
t/t4010-diff-pathspec.sh
View File

@ -110,4 +110,21 @@ test_expect_success 'diff-tree -r with wildcard' '
test_cmp expected result test_cmp expected result
' '


test_expect_success 'setup submodules' '
test_tick &&
git init submod &&
( cd submod && test_commit first; ) &&
git add submod &&
git commit -m first &&
( cd submod && test_commit second; ) &&
git add submod &&
git commit -m second
'

test_expect_success 'diff-tree ignores trailing slash on submodule path' '
git diff --name-only HEAD^ HEAD submod >expect &&
git diff --name-only HEAD^ HEAD submod/ >actual &&
test_cmp expect actual
'

test_done test_done

2
tree-walk.c
View File

@ -543,7 +543,7 @@ static int match_entry(const struct pathspec_item *item,
if (matchlen > pathlen) { if (matchlen > pathlen) {
if (match[pathlen] != '/') if (match[pathlen] != '/')
return 0; return 0;
if (!S_ISDIR(entry->mode)) if (!S_ISDIR(entry->mode) && !S_ISGITLINK(entry->mode))
return 0; return 0;
} }