From: Stefan Beller <sbeller@google.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (May 2017, #07; Tue, 23)
Date: Tue, 23 May 2017 12:38:04 -0700 [thread overview]
Message-ID: <CAGZ79kYoHYz6hi5kDjQBcN-35c0kXE6mf6NNV_Z_F6-UqZ=3cw@mail.gmail.com> (raw)
In-Reply-To: <CAGZ79kZMJP7K5MU0UujuEatZ2MOrSnFpfD707aSGa64mKyCZbw@mail.gmail.com>
On Tue, May 23, 2017 at 12:08 PM, Stefan Beller <sbeller@google.com> wrote:
> On Tue, May 23, 2017 at 1:08 AM, Junio C Hamano <gitster@pobox.com> wrote:
>
>> * sb/submodule-blanket-recursive (2017-05-23) 6 commits
>> . builtin/push.c: respect 'submodule.recurse' option
>> . builtin/grep.c: respect 'submodule.recurse' option
>> . builtin/fetch.c: respect 'submodule.recurse' option
>> . Introduce submodule.recurse option for worktree manipulators
>> . submodule test invocation: only pass additional arguments
>> . submodule.c: add has_submodules to check if we have any submodules
>> (this branch uses sb/reset-recurse-submodules.)
>>
>> A new configuration variable "submodule.recurse" can be set to true
>> to force various commands run at the top-level superproject to
>> behave as if they were invoked with the "--recurse-submodules"
>> option.
>>
>> Seems to break t7814 when merged to 'pu'.
>
> I will investigate! (It passes on its own, so I guess it is some
> interference with a recent grep series)
And the winner is 5d52a30eda (grep: amend submodule recursion
test for regex engine testing, 2017-05-20, by Ævar)
The tests added by grep rely on the old content of
test 2 'grep correctly finds patterns in a submodule'.
The (whitespace broken) diff below fixes it.
I think the best way forward is that my series relies on
that series as a foundation then, and writes correct tests based
on the file contents at that version.
---8<---
diff --git a/t/t7814-grep-recurse-submodules.sh
b/t/t7814-grep-recurse-submodules.sh
index 14eeb54b4b..ce9fbbc1f6 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 -e3 >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 -e4 --no-recurse-submodules >actual &&
test_cmp expect actual
'
---8<---
Thanks,
Stefan
next prev parent reply other threads:[~2017-05-23 19:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 8:08 What's cooking in git.git (May 2017, #07; Tue, 23) Junio C Hamano
2017-05-23 19:08 ` Stefan Beller
2017-05-23 19:38 ` Stefan Beller [this message]
2017-05-23 19:50 ` Ævar Arnfjörð Bjarmason
2017-05-25 3:42 ` Junio C Hamano
2017-05-25 5:42 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGZ79kYoHYz6hi5kDjQBcN-35c0kXE6mf6NNV_Z_F6-UqZ=3cw@mail.gmail.com' \
--to=sbeller@google.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).