2016-12-16 20:03:20 +01:00
|
|
|
#!/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' '
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >a &&
|
2016-12-16 20:03:20 +01:00
|
|
|
mkdir b &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(3|4)" >b/b &&
|
2016-12-16 20:03:20 +01:00
|
|
|
git add a b &&
|
|
|
|
git commit -m "add a and b" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:20 +01:00
|
|
|
git init submodule &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >submodule/a &&
|
2016-12-16 20:03:20 +01:00
|
|
|
git -C submodule add a &&
|
|
|
|
git -C submodule commit -m "add a" &&
|
|
|
|
git submodule add ./submodule &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
git commit -m "added submodule" &&
|
|
|
|
test_tick
|
2016-12-16 20:03:20 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep correctly finds patterns in a submodule' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
a:(1|2)d(3|4)
|
|
|
|
b/b:(3|4)
|
|
|
|
submodule/a:(1|2)d(3|4)
|
2016-12-16 20:03:20 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --recurse-submodules >actual &&
|
2016-12-16 20:03:20 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2017-06-01 02:30:48 +02:00
|
|
|
test_expect_success 'grep finds patterns in a submodule via config' '
|
|
|
|
test_config submodule.recurse true &&
|
|
|
|
# expect from previous test
|
|
|
|
git grep -e "(3|4)" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep --no-recurse-submodules overrides config' '
|
|
|
|
test_config submodule.recurse true &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
a:(1|2)d(3|4)
|
|
|
|
b/b:(3|4)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git grep -e "(3|4)" --no-recurse-submodules >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2016-12-16 20:03:20 +01:00
|
|
|
test_expect_success 'grep and basic pathspecs' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
submodule/a:(1|2)d(3|4)
|
2016-12-16 20:03:20 +01:00
|
|
|
EOF
|
|
|
|
|
|
|
|
git grep -e. --recurse-submodules -- submodule >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep and nested submodules' '
|
|
|
|
git init submodule/sub &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >submodule/sub/a &&
|
2016-12-16 20:03:20 +01:00
|
|
|
git -C submodule/sub add a &&
|
|
|
|
git -C submodule/sub commit -m "add a" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:20 +01:00
|
|
|
git -C submodule submodule add ./sub &&
|
|
|
|
git -C submodule add sub &&
|
|
|
|
git -C submodule commit -m "added sub" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:20 +01:00
|
|
|
git add submodule &&
|
|
|
|
git commit -m "updated submodule" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:20 +01:00
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
a:(1|2)d(3|4)
|
|
|
|
b/b:(3|4)
|
|
|
|
submodule/a:(1|2)d(3|4)
|
|
|
|
submodule/sub/a:(1|2)d(3|4)
|
2016-12-16 20:03:20 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --recurse-submodules >actual &&
|
2016-12-16 20:03:20 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep and multiple patterns' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
a:(1|2)d(3|4)
|
|
|
|
submodule/a:(1|2)d(3|4)
|
|
|
|
submodule/sub/a:(1|2)d(3|4)
|
2016-12-16 20:03:20 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --and -e "(1|2)" --recurse-submodules >actual &&
|
2016-12-16 20:03:20 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep and multiple patterns' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
b/b:(3|4)
|
2016-12-16 20:03:20 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --and --not -e "(1|2)" --recurse-submodules >actual &&
|
2016-12-16 20:03:20 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2016-12-16 20:03:21 +01:00
|
|
|
test_expect_success 'basic grep tree' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
HEAD:a:(1|2)d(3|4)
|
|
|
|
HEAD:b/b:(3|4)
|
|
|
|
HEAD:submodule/a:(1|2)d(3|4)
|
|
|
|
HEAD:submodule/sub/a:(1|2)d(3|4)
|
2016-12-16 20:03:21 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --recurse-submodules HEAD >actual &&
|
2016-12-16 20:03:21 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep tree HEAD^' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
HEAD^:a:(1|2)d(3|4)
|
|
|
|
HEAD^:b/b:(3|4)
|
|
|
|
HEAD^:submodule/a:(1|2)d(3|4)
|
2016-12-16 20:03:21 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --recurse-submodules HEAD^ >actual &&
|
2016-12-16 20:03:21 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep tree HEAD^^' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
HEAD^^:a:(1|2)d(3|4)
|
|
|
|
HEAD^^:b/b:(3|4)
|
2016-12-16 20:03:21 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --recurse-submodules HEAD^^ >actual &&
|
2016-12-16 20:03:21 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep tree and pathspecs' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
HEAD:submodule/a:(1|2)d(3|4)
|
|
|
|
HEAD:submodule/sub/a:(1|2)d(3|4)
|
2016-12-16 20:03:21 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --recurse-submodules HEAD -- submodule >actual &&
|
2016-12-16 20:03:21 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep tree and pathspecs' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
HEAD:submodule/a:(1|2)d(3|4)
|
|
|
|
HEAD:submodule/sub/a:(1|2)d(3|4)
|
2016-12-16 20:03:21 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --recurse-submodules HEAD -- "submodule*a" >actual &&
|
2016-12-16 20:03:21 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep tree and more pathspecs' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
HEAD:submodule/a:(1|2)d(3|4)
|
2016-12-16 20:03:21 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --recurse-submodules HEAD -- "submodul?/a" >actual &&
|
2016-12-16 20:03:21 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep tree and more pathspecs' '
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
HEAD:submodule/sub/a:(1|2)d(3|4)
|
2016-12-16 20:03:21 +01:00
|
|
|
EOF
|
|
|
|
|
2017-05-20 23:42:13 +02:00
|
|
|
git grep -e "(3|4)" --recurse-submodules HEAD -- "submodul*/sub/a" >actual &&
|
2016-12-16 20:03:21 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success !MINGW 'grep recurse submodule colon in name' '
|
|
|
|
git init parent &&
|
|
|
|
test_when_finished "rm -rf parent" &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >"parent/fi:le" &&
|
2016-12-16 20:03:21 +01:00
|
|
|
git -C parent add "fi:le" &&
|
|
|
|
git -C parent commit -m "add fi:le" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:21 +01:00
|
|
|
|
|
|
|
git init "su:b" &&
|
|
|
|
test_when_finished "rm -rf su:b" &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >"su:b/fi:le" &&
|
2016-12-16 20:03:21 +01:00
|
|
|
git -C "su:b" add "fi:le" &&
|
|
|
|
git -C "su:b" commit -m "add fi:le" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:21 +01:00
|
|
|
|
|
|
|
git -C parent submodule add "../su:b" "su:b" &&
|
|
|
|
git -C parent commit -m "add submodule" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:21 +01:00
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
fi:le:(1|2)d(3|4)
|
|
|
|
su:b/fi:le:(1|2)d(3|4)
|
2016-12-16 20:03:21 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
|
2016-12-16 20:03:21 +01:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
HEAD:fi:le:(1|2)d(3|4)
|
|
|
|
HEAD:su:b/fi:le:(1|2)d(3|4)
|
2016-12-16 20:03:21 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules HEAD >actual &&
|
2016-12-16 20:03:21 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2016-12-16 20:03:22 +01:00
|
|
|
test_expect_success 'grep history with moved submoules' '
|
|
|
|
git init parent &&
|
|
|
|
test_when_finished "rm -rf parent" &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >parent/file &&
|
2016-12-16 20:03:22 +01:00
|
|
|
git -C parent add file &&
|
|
|
|
git -C parent commit -m "add file" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:22 +01:00
|
|
|
|
|
|
|
git init sub &&
|
|
|
|
test_when_finished "rm -rf sub" &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >sub/file &&
|
2016-12-16 20:03:22 +01:00
|
|
|
git -C sub add file &&
|
|
|
|
git -C sub commit -m "add file" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:22 +01:00
|
|
|
|
|
|
|
git -C parent submodule add ../sub dir/sub &&
|
|
|
|
git -C parent commit -m "add submodule" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:22 +01:00
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
dir/sub/file:(1|2)d(3|4)
|
|
|
|
file:(1|2)d(3|4)
|
2016-12-16 20:03:22 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
|
2016-12-16 20:03:22 +01:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
git -C parent mv dir/sub sub-moved &&
|
|
|
|
git -C parent commit -m "moved submodule" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2016-12-16 20:03:22 +01:00
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
file:(1|2)d(3|4)
|
|
|
|
sub-moved/file:(1|2)d(3|4)
|
2016-12-16 20:03:22 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules >actual &&
|
2016-12-16 20:03:22 +01:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
HEAD^:dir/sub/file:(1|2)d(3|4)
|
|
|
|
HEAD^:file:(1|2)d(3|4)
|
2016-12-16 20:03:22 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent grep -e "(1|2)d(3|4)" --recurse-submodules HEAD^ >actual &&
|
2016-12-16 20:03:22 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2017-03-17 18:22:55 +01:00
|
|
|
test_expect_success 'grep using relative path' '
|
|
|
|
test_when_finished "rm -rf parent sub" &&
|
|
|
|
git init sub &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >sub/file &&
|
2017-03-17 18:22:55 +01:00
|
|
|
git -C sub add file &&
|
|
|
|
git -C sub commit -m "add file" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2017-03-17 18:22:55 +01:00
|
|
|
|
|
|
|
git init parent &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >parent/file &&
|
2017-03-17 18:22:55 +01:00
|
|
|
git -C parent add file &&
|
|
|
|
mkdir parent/src &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >parent/src/file2 &&
|
2017-03-17 18:22:55 +01:00
|
|
|
git -C parent add src/file2 &&
|
|
|
|
git -C parent submodule add ../sub &&
|
|
|
|
git -C parent commit -m "add files and submodule" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2017-03-17 18:22:55 +01:00
|
|
|
|
|
|
|
# From top works
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
file:(1|2)d(3|4)
|
|
|
|
src/file2:(1|2)d(3|4)
|
|
|
|
sub/file:(1|2)d(3|4)
|
2017-03-17 18:22:55 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
|
2017-03-17 18:22:55 +01:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
# Relative path to top
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
../file:(1|2)d(3|4)
|
|
|
|
file2:(1|2)d(3|4)
|
|
|
|
../sub/file:(1|2)d(3|4)
|
2017-03-17 18:22:55 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" -- .. >actual &&
|
2017-03-17 18:22:55 +01:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
# Relative path to submodule
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
../sub/file:(1|2)d(3|4)
|
2017-03-17 18:22:55 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" -- ../sub >actual &&
|
2017-03-17 18:22:55 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep from a subdir' '
|
|
|
|
test_when_finished "rm -rf parent sub" &&
|
|
|
|
git init sub &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >sub/file &&
|
2017-03-17 18:22:55 +01:00
|
|
|
git -C sub add file &&
|
|
|
|
git -C sub commit -m "add file" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2017-03-17 18:22:55 +01:00
|
|
|
|
|
|
|
git init parent &&
|
|
|
|
mkdir parent/src &&
|
2017-05-20 23:42:13 +02:00
|
|
|
echo "(1|2)d(3|4)" >parent/src/file &&
|
2017-03-17 18:22:55 +01:00
|
|
|
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" &&
|
t7814: do not generate same commits in different repos
t7814 has repo tree like this
initial-repo
submodule
sub
In each repo 'submodule' and 'sub', a commit is made to add the same
initial file 'a' with the same message 'add a'. If tests run fast
enough, the two commits are made in the same second, resulting
identical commits.
There is nothing wrong with that per-se. But it could make the test
flaky. Currently all submodule odbs are merged back in the main
one (because we can't, or couldn't, access separate submodule repos
otherwise). But eventually we need to access objects from the right
repo.
Because the same commit could sometimes be present in both 'submodule'
and 'sub', if there is a bug looking up objects in the wrong repo,
sometimes it will go unnoticed because it finds the needed object in the
wrong repo anyway.
Fix this by changing commit time after every commit. This makes all
commits unique. Of course there are still identical blobs in different
repos, but because we often lookup commit first, then tree and blob,
unique commits are already quite safe.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-28 11:35:28 +02:00
|
|
|
test_tick &&
|
2017-03-17 18:22:55 +01:00
|
|
|
|
|
|
|
# Verify grep from root works
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
src/file:(1|2)d(3|4)
|
|
|
|
src/sub/file:(1|2)d(3|4)
|
|
|
|
sub/file:(1|2)d(3|4)
|
2017-03-17 18:22:55 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
|
2017-03-17 18:22:55 +01:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
# Verify grep from a subdir works
|
|
|
|
cat >expect <<-\EOF &&
|
2017-05-20 23:42:13 +02:00
|
|
|
file:(1|2)d(3|4)
|
|
|
|
sub/file:(1|2)d(3|4)
|
2017-03-17 18:22:55 +01:00
|
|
|
EOF
|
2017-05-20 23:42:13 +02:00
|
|
|
git -C parent/src grep --recurse-submodules -e "(1|2)d(3|4)" >actual &&
|
2017-03-17 18:22:55 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2016-12-16 20:03:20 +01:00
|
|
|
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
|
2020-01-30 14:37:28 +01:00
|
|
|
|
|
|
|
test_expect_success 'grep --recurse-submodules --no-index ignores --recurse-submodules' '
|
|
|
|
git grep --recurse-submodules --no-index -e "^(.|.)[\d]" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
a:(1|2)d(3|4)
|
|
|
|
submodule/a:(1|2)d(3|4)
|
|
|
|
submodule/sub/a:(1|2)d(3|4)
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2016-12-16 20:03:20 +01:00
|
|
|
|
2017-05-20 23:42:14 +02:00
|
|
|
test_expect_success 'grep --recurse-submodules should pass the pattern type along' '
|
|
|
|
# Fixed
|
|
|
|
test_must_fail git grep -F --recurse-submodules -e "(.|.)[\d]" &&
|
|
|
|
test_must_fail git -c grep.patternType=fixed grep --recurse-submodules -e "(.|.)[\d]" &&
|
|
|
|
|
|
|
|
# Basic
|
|
|
|
git grep -G --recurse-submodules -e "(.|.)[\d]" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
a:(1|2)d(3|4)
|
|
|
|
submodule/a:(1|2)d(3|4)
|
|
|
|
submodule/sub/a:(1|2)d(3|4)
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git -c grep.patternType=basic grep --recurse-submodules -e "(.|.)[\d]" >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
# Extended
|
|
|
|
git grep -E --recurse-submodules -e "(.|.)[\d]" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
.gitmodules:[submodule "submodule"]
|
|
|
|
.gitmodules: path = submodule
|
|
|
|
.gitmodules: url = ./submodule
|
|
|
|
a:(1|2)d(3|4)
|
|
|
|
submodule/.gitmodules:[submodule "sub"]
|
|
|
|
submodule/a:(1|2)d(3|4)
|
|
|
|
submodule/sub/a:(1|2)d(3|4)
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git -c grep.patternType=extended grep --recurse-submodules -e "(.|.)[\d]" >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git -c grep.extendedRegexp=true grep --recurse-submodules -e "(.|.)[\d]" >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
# Perl
|
|
|
|
if test_have_prereq PCRE
|
|
|
|
then
|
|
|
|
git grep -P --recurse-submodules -e "(.|.)[\d]" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
a:(1|2)d(3|4)
|
|
|
|
b/b:(3|4)
|
|
|
|
submodule/a:(1|2)d(3|4)
|
|
|
|
submodule/sub/a:(1|2)d(3|4)
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git -c grep.patternType=perl grep --recurse-submodules -e "(.|.)[\d]" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
2019-04-16 11:33:38 +02:00
|
|
|
test_expect_success 'grep --recurse-submodules with submodules without .gitmodules in the working tree' '
|
2018-10-25 18:18:12 +02:00
|
|
|
test_when_finished "git -C submodule checkout .gitmodules" &&
|
|
|
|
rm submodule/.gitmodules &&
|
|
|
|
git grep --recurse-submodules -e "(.|.)[\d]" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
a:(1|2)d(3|4)
|
|
|
|
submodule/a:(1|2)d(3|4)
|
|
|
|
submodule/sub/a:(1|2)d(3|4)
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2019-07-30 18:53:27 +02:00
|
|
|
reset_and_clean () {
|
|
|
|
git reset --hard &&
|
|
|
|
git clean -fd &&
|
|
|
|
git submodule foreach --recursive 'git reset --hard' &&
|
|
|
|
git submodule foreach --recursive 'git clean -fd'
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'grep --recurse-submodules without --cached considers worktree modifications' '
|
|
|
|
reset_and_clean &&
|
|
|
|
echo "A modified line in submodule" >>submodule/a &&
|
|
|
|
echo "submodule/a:A modified line in submodule" >expect &&
|
|
|
|
git grep --recurse-submodules "A modified line in submodule" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'grep --recurse-submodules with --cached ignores worktree modifications' '
|
|
|
|
reset_and_clean &&
|
|
|
|
echo "A modified line in submodule" >>submodule/a &&
|
|
|
|
test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
|
|
|
|
test_must_be_empty actual
|
|
|
|
'
|
2016-12-16 20:03:20 +01:00
|
|
|
test_done
|