mirror of
https://github.com/git/git
synced 2024-09-19 08:21:36 +00:00
be80a2392f
When using the --recurse-submodules flag with a relative pathspec which includes "..", an error is produced inside the child process spawned for a submodule. When creating the pathspec struct in the child, the ".." is interpreted to mean "go up a directory" which causes an error stating that the path ".." is outside of the repository. While it is true that ".." is outside the scope of the submodule, it is confusing to a user who originally invoked the command where ".." was indeed still inside the scope of the superproject. Since the child process launched for the submodule has some context that it is operating underneath a superproject, this error could be avoided. This patch fixes the bug by passing the 'prefix' to the child process. Now each child process that works on a submodule has two points of reference to the superproject: (1) the 'super_prefix' which is the path from the root of the superproject down to root of the submodule and (2) the 'prefix' which is the path from the root of the superproject down to the directory where the user invoked the git command. With these two pieces of information a child process can correctly interpret the pathspecs provided by the user as well as being able to properly format its output relative to the directory the user invoked the original command from. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
317 lines
7.3 KiB
Bash
Executable file
317 lines
7.3 KiB
Bash
Executable file
#!/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_expect_success 'grep using relative path' '
|
|
test_when_finished "rm -rf parent sub" &&
|
|
git init sub &&
|
|
echo "foobar" >sub/file &&
|
|
git -C sub add file &&
|
|
git -C sub commit -m "add file" &&
|
|
|
|
git init parent &&
|
|
echo "foobar" >parent/file &&
|
|
git -C parent add file &&
|
|
mkdir parent/src &&
|
|
echo "foobar" >parent/src/file2 &&
|
|
git -C parent add src/file2 &&
|
|
git -C parent submodule add ../sub &&
|
|
git -C parent commit -m "add files and submodule" &&
|
|
|
|
# From top works
|
|
cat >expect <<-\EOF &&
|
|
file:foobar
|
|
src/file2:foobar
|
|
sub/file:foobar
|
|
EOF
|
|
git -C parent grep --recurse-submodules -e "foobar" >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
# Relative path to top
|
|
cat >expect <<-\EOF &&
|
|
../file:foobar
|
|
file2:foobar
|
|
../sub/file:foobar
|
|
EOF
|
|
git -C parent/src grep --recurse-submodules -e "foobar" -- .. >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
# Relative path to submodule
|
|
cat >expect <<-\EOF &&
|
|
../sub/file:foobar
|
|
EOF
|
|
git -C parent/src grep --recurse-submodules -e "foobar" -- ../sub >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep from a subdir' '
|
|
test_when_finished "rm -rf parent sub" &&
|
|
git init sub &&
|
|
echo "foobar" >sub/file &&
|
|
git -C sub add file &&
|
|
git -C sub commit -m "add file" &&
|
|
|
|
git init parent &&
|
|
mkdir parent/src &&
|
|
echo "foobar" >parent/src/file &&
|
|
git -C parent add src/file &&
|
|
git -C parent submodule add ../sub src/sub &&
|
|
git -C parent submodule add ../sub sub &&
|
|
git -C parent commit -m "add files and submodules" &&
|
|
|
|
# Verify grep from root works
|
|
cat >expect <<-\EOF &&
|
|
src/file:foobar
|
|
src/sub/file:foobar
|
|
sub/file:foobar
|
|
EOF
|
|
git -C parent grep --recurse-submodules -e "foobar" >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
# Verify grep from a subdir works
|
|
cat >expect <<-\EOF &&
|
|
file:foobar
|
|
sub/file:foobar
|
|
EOF
|
|
git -C parent/src grep --recurse-submodules -e "foobar" >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
|