You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
241 lines
5.5 KiB
241 lines
5.5 KiB
#!/bin/sh |
|
|
|
test_description='Test grep recurse-submodules feature |
|
|
|
This test verifies the recurse-submodules feature correctly greps across |
|
submodules. |
|
' |
|
|
|
. ./test-lib.sh |
|
|
|
test_expect_success 'setup directory structure and submodule' ' |
|
echo "foobar" >a && |
|
mkdir b && |
|
echo "bar" >b/b && |
|
git add a b && |
|
git commit -m "add a and b" && |
|
git init submodule && |
|
echo "foobar" >submodule/a && |
|
git -C submodule add a && |
|
git -C submodule commit -m "add a" && |
|
git submodule add ./submodule && |
|
git commit -m "added submodule" |
|
' |
|
|
|
test_expect_success 'grep correctly finds patterns in a submodule' ' |
|
cat >expect <<-\EOF && |
|
a:foobar |
|
b/b:bar |
|
submodule/a:foobar |
|
EOF |
|
|
|
git grep -e "bar" --recurse-submodules >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep and basic pathspecs' ' |
|
cat >expect <<-\EOF && |
|
submodule/a:foobar |
|
EOF |
|
|
|
git grep -e. --recurse-submodules -- submodule >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep and nested submodules' ' |
|
git init submodule/sub && |
|
echo "foobar" >submodule/sub/a && |
|
git -C submodule/sub add a && |
|
git -C submodule/sub commit -m "add a" && |
|
git -C submodule submodule add ./sub && |
|
git -C submodule add sub && |
|
git -C submodule commit -m "added sub" && |
|
git add submodule && |
|
git commit -m "updated submodule" && |
|
|
|
cat >expect <<-\EOF && |
|
a:foobar |
|
b/b:bar |
|
submodule/a:foobar |
|
submodule/sub/a:foobar |
|
EOF |
|
|
|
git grep -e "bar" --recurse-submodules >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep and multiple patterns' ' |
|
cat >expect <<-\EOF && |
|
a:foobar |
|
submodule/a:foobar |
|
submodule/sub/a:foobar |
|
EOF |
|
|
|
git grep -e "bar" --and -e "foo" --recurse-submodules >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep and multiple patterns' ' |
|
cat >expect <<-\EOF && |
|
b/b:bar |
|
EOF |
|
|
|
git grep -e "bar" --and --not -e "foo" --recurse-submodules >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'basic grep tree' ' |
|
cat >expect <<-\EOF && |
|
HEAD:a:foobar |
|
HEAD:b/b:bar |
|
HEAD:submodule/a:foobar |
|
HEAD:submodule/sub/a:foobar |
|
EOF |
|
|
|
git grep -e "bar" --recurse-submodules HEAD >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep tree HEAD^' ' |
|
cat >expect <<-\EOF && |
|
HEAD^:a:foobar |
|
HEAD^:b/b:bar |
|
HEAD^:submodule/a:foobar |
|
EOF |
|
|
|
git grep -e "bar" --recurse-submodules HEAD^ >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep tree HEAD^^' ' |
|
cat >expect <<-\EOF && |
|
HEAD^^:a:foobar |
|
HEAD^^:b/b:bar |
|
EOF |
|
|
|
git grep -e "bar" --recurse-submodules HEAD^^ >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep tree and pathspecs' ' |
|
cat >expect <<-\EOF && |
|
HEAD:submodule/a:foobar |
|
HEAD:submodule/sub/a:foobar |
|
EOF |
|
|
|
git grep -e "bar" --recurse-submodules HEAD -- submodule >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep tree and pathspecs' ' |
|
cat >expect <<-\EOF && |
|
HEAD:submodule/a:foobar |
|
HEAD:submodule/sub/a:foobar |
|
EOF |
|
|
|
git grep -e "bar" --recurse-submodules HEAD -- "submodule*a" >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep tree and more pathspecs' ' |
|
cat >expect <<-\EOF && |
|
HEAD:submodule/a:foobar |
|
EOF |
|
|
|
git grep -e "bar" --recurse-submodules HEAD -- "submodul?/a" >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep tree and more pathspecs' ' |
|
cat >expect <<-\EOF && |
|
HEAD:submodule/sub/a:foobar |
|
EOF |
|
|
|
git grep -e "bar" --recurse-submodules HEAD -- "submodul*/sub/a" >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success !MINGW 'grep recurse submodule colon in name' ' |
|
git init parent && |
|
test_when_finished "rm -rf parent" && |
|
echo "foobar" >"parent/fi:le" && |
|
git -C parent add "fi:le" && |
|
git -C parent commit -m "add fi:le" && |
|
|
|
git init "su:b" && |
|
test_when_finished "rm -rf su:b" && |
|
echo "foobar" >"su:b/fi:le" && |
|
git -C "su:b" add "fi:le" && |
|
git -C "su:b" commit -m "add fi:le" && |
|
|
|
git -C parent submodule add "../su:b" "su:b" && |
|
git -C parent commit -m "add submodule" && |
|
|
|
cat >expect <<-\EOF && |
|
fi:le:foobar |
|
su:b/fi:le:foobar |
|
EOF |
|
git -C parent grep -e "foobar" --recurse-submodules >actual && |
|
test_cmp expect actual && |
|
|
|
cat >expect <<-\EOF && |
|
HEAD:fi:le:foobar |
|
HEAD:su:b/fi:le:foobar |
|
EOF |
|
git -C parent grep -e "foobar" --recurse-submodules HEAD >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success 'grep history with moved submoules' ' |
|
git init parent && |
|
test_when_finished "rm -rf parent" && |
|
echo "foobar" >parent/file && |
|
git -C parent add file && |
|
git -C parent commit -m "add file" && |
|
|
|
git init sub && |
|
test_when_finished "rm -rf sub" && |
|
echo "foobar" >sub/file && |
|
git -C sub add file && |
|
git -C sub commit -m "add file" && |
|
|
|
git -C parent submodule add ../sub dir/sub && |
|
git -C parent commit -m "add submodule" && |
|
|
|
cat >expect <<-\EOF && |
|
dir/sub/file:foobar |
|
file:foobar |
|
EOF |
|
git -C parent grep -e "foobar" --recurse-submodules >actual && |
|
test_cmp expect actual && |
|
|
|
git -C parent mv dir/sub sub-moved && |
|
git -C parent commit -m "moved submodule" && |
|
|
|
cat >expect <<-\EOF && |
|
file:foobar |
|
sub-moved/file:foobar |
|
EOF |
|
git -C parent grep -e "foobar" --recurse-submodules >actual && |
|
test_cmp expect actual && |
|
|
|
cat >expect <<-\EOF && |
|
HEAD^:dir/sub/file:foobar |
|
HEAD^:file:foobar |
|
EOF |
|
git -C parent grep -e "foobar" --recurse-submodules HEAD^ >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_incompatible_with_recurse_submodules () |
|
{ |
|
test_expect_success "--recurse-submodules and $1 are incompatible" " |
|
test_must_fail git grep -e. --recurse-submodules $1 2>actual && |
|
test_i18ngrep 'not supported with --recurse-submodules' actual |
|
" |
|
} |
|
|
|
test_incompatible_with_recurse_submodules --untracked |
|
test_incompatible_with_recurse_submodules --no-index |
|
|
|
test_done
|
|
|