On Wed, May 24, 2017 at 8:42 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > >>> The tests added by grep rely on the old content of >>> test 2 'grep correctly finds patterns in a submodule'. >> >> Sorry about the fallout. >> >>> The (whitespace broken) diff below fixes it. > > Ah, then, this was an example of maintainer not doing a good job. > When I see a topic that pass its own test that fails when merged to > 'pu', I usually try to see where it goes wrong myself and come up > with a fix in an evil merge, but this time I didn't have enough time > to do so before sending out the "What's cooking" report. > > Here is what I taught my merge-fix machinery to apply after > mechanical merge of the two topics. Please evict (or stop paying attention to) sb/submodule-blanket-recursive as it is fundamentally broken. I hoped to resend a fixed version today, but it took me longer than expected to figure out the config machinery playing with submodules. The diff below looks correct to me. Thanks, Stefan > > t/t7814-grep-recurse-submodules.sh | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh > index 14eeb54b4b..7184113b9b 100755 > --- a/t/t7814-grep-recurse-submodules.sh > +++ b/t/t7814-grep-recurse-submodules.sh > @@ -36,18 +36,18 @@ test_expect_success 'grep correctly finds patterns in a submodule' ' > test_expect_success 'grep finds patterns in a submodule via config' ' > test_config submodule.recurse true && > # expect from previous test > - git grep -e "bar" >actual && > + 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:foobar > - b/b:bar > + a:(1|2)d(3|4) > + b/b:(3|4) > EOF > > - git grep -e "bar" --no-recurse-submodules >actual && > + git grep -e "(3|4)" --no-recurse-submodules >actual && > test_cmp expect actual > ' > > -- > 2.13.0-491-g71cfeddc25 >