mirror of
https://github.com/git/git.git
synced 2024-11-06 01:03:02 +01:00
4838237cb7
The pathspec structure has a few bits of data to drive various operation modes after we unified the pathspec matching logic in various codepaths. For example, max_depth field is there so that "git grep" can limit the output for files found in limited depth of tree traversal. Also in order to show just the surface level differences in "git diff-tree", recursive field stops us from descending into deeper level of the tree structure when it is set to false, and this also affects pathspec matching when we have wildcards in the pathspec. The diff-index has always wanted the recursive behaviour, and wanted to match pathspecs without any depth limit. But we forgot to do so when we updated tree_entry_interesting() logic to unify the pathspec matching logic. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
113 lines
3.2 KiB
Bash
Executable file
113 lines
3.2 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='Pathspec restrictions
|
|
|
|
Prepare:
|
|
file0
|
|
path1/file1
|
|
'
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
|
|
|
|
test_expect_success \
|
|
setup \
|
|
'echo frotz >file0 &&
|
|
mkdir path1 &&
|
|
echo rezrov >path1/file1 &&
|
|
git update-index --add file0 path1/file1 &&
|
|
tree=`git write-tree` &&
|
|
echo "$tree" &&
|
|
echo nitfol >file0 &&
|
|
echo yomin >path1/file1 &&
|
|
git update-index file0 path1/file1'
|
|
|
|
cat >expected <<\EOF
|
|
EOF
|
|
test_expect_success \
|
|
'limit to path should show nothing' \
|
|
'git diff-index --cached $tree -- path >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
cat >expected <<\EOF
|
|
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1
|
|
EOF
|
|
test_expect_success \
|
|
'limit to path1 should show path1/file1' \
|
|
'git diff-index --cached $tree -- path1 >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
cat >expected <<\EOF
|
|
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1
|
|
EOF
|
|
test_expect_success \
|
|
'limit to path1/ should show path1/file1' \
|
|
'git diff-index --cached $tree -- path1/ >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
cat >expected <<\EOF
|
|
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1
|
|
EOF
|
|
test_expect_success \
|
|
'"*file1" should show path1/file1' \
|
|
'git diff-index --cached $tree -- "*file1" >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
cat >expected <<\EOF
|
|
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M file0
|
|
EOF
|
|
test_expect_success \
|
|
'limit to file0 should show file0' \
|
|
'git diff-index --cached $tree -- file0 >current &&
|
|
compare_diff_raw current expected'
|
|
|
|
cat >expected <<\EOF
|
|
EOF
|
|
test_expect_success \
|
|
'limit to file0/ should emit nothing.' \
|
|
'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
|
|
'
|
|
|
|
EMPTY_TREE=4b825dc642cb6eb9a060e54bf8d69288fbee4904
|
|
|
|
test_expect_success 'diff-tree with wildcard shows dir also matches' '
|
|
git diff-tree --name-only $EMPTY_TREE $tree -- "f*" >result &&
|
|
echo file0 >expected &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'diff-tree -r with wildcard' '
|
|
git diff-tree -r --name-only $EMPTY_TREE $tree -- "*file1" >result &&
|
|
echo path1/file1 >expected &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'diff-tree with wildcard shows dir also matches' '
|
|
git diff-tree --name-only $tree $tree2 -- "path1/f*" >result &&
|
|
echo path1 >expected &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'diff-tree -r with wildcard from beginning' '
|
|
git diff-tree -r --name-only $tree $tree2 -- "path1/*file1" >result &&
|
|
echo path1/file1 >expected &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_expect_success 'diff-tree -r with wildcard' '
|
|
git diff-tree -r --name-only $tree $tree2 -- "path1/f*" >result &&
|
|
echo path1/file1 >expected &&
|
|
test_cmp expected result
|
|
'
|
|
|
|
test_done
|