Re: [PATCH v2 1/1] submodule foreach: fix recursion of options
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Hello Johannes,
thank your for the review. Sorry for the spam, I messed up with the replytoall command.
Show 51 quoted lines
> Hi Morian,
>
> On Tue, 18 Jun 2019, Morian Sonnet wrote:
>
> > "Morian Sonnet via GitGitGadget" <gitgitgadget@gmail.com> wrote:
> >
> > > Calling
> > >
> > > git submodule foreach --recursive git reset --hard
> > >
> > > leads to an error stating that the option --hard is unknown to
> > > submodule--helper.
> > >
> > > Reasons:
> > >
> > > . Above call is internally translated into
> > >
> > > git submodule--helper foreach --recursive -- git reset --hard
> > >
> > > . After calling
> > >
> > > git reset --hard
> > >
> > > inside the first first level submodule,
> > >
> > > git --super-prefix <submodulepath> submodule--helper \
> > > foreach --recursive git reset --hard
> > >
> > > is called. Note the missing --.
> > >
> > > . Due to the removal of PARSE_OPT_KEEP_UNKNOWN in commit a282f5a906 the
> > > option --hard is not passed to
> > >
> > > git reset
> > >
> > > anymore, but leads to git submodule--helper complaining about an
> > > unknown option.
> > >
> > > Fix:
> > >
> > > . Add -- before the command to execute, such that now correctly
> > >
> > > git --super-prefix <submodulepath> submodule--helper \
> > > foreach --recursive -- git reset --hard
> > >
> > > is called.
>
> This is a good explanation, even if the format is not exactly close to the
> existing commit messages ;-) If you look e.g. at
> https://github.com/git/git/commit/e5a329a279c7, you will see what I mean:
> there is much more "prose" (and less bullet points) going on.
Ok, I see the differences. Shall I adapt the commit description?
Show 43 quoted lines
>
> > > Signed-off-by: Morian Sonnet <moriansonnet@googlemail.com>
> > > ---
> > > builtin/submodule--helper.c | 1 +
> > > t/t7407-submodule-foreach.sh | 7 +++++++
> > > 2 files changed, 8 insertions(+)
> > >
> > > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> > > index 0bf4aa088e..afaf0819c9 100644
> > > --- a/builtin/submodule--helper.c
> > > +++ b/builtin/submodule--helper.c
> > > @@ -540,6 +540,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
> > > if (info->quiet)
> > > argv_array_push(&cpr.args, "--quiet");
> > >
> > > + argv_array_push(&cpr.args, "--");
>
> This is obviously correct.
>
> > > argv_array_pushv(&cpr.args, info->argv);
> > >
> > > if (run_command(&cpr))
> > > diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
> > > index 706ae762e0..c554589e6f 100755
> > > --- a/t/t7407-submodule-foreach.sh
> > > +++ b/t/t7407-submodule-foreach.sh
> > > @@ -421,4 +421,11 @@ test_expect_success 'option-like arguments passed to foreach commands are not lo
> > > test_cmp expected actual
> > > '
> > >
> > > +test_expect_success 'option-like arguments passed to foreach recurse correctly' '
> > > + (
> > > + cd super &&
> > > + git submodule foreach --recursive git reset --hard
> > > + )
>
> I am terribly sorry that I did not catch this in the first round. I would
> find it even easier to read if it used the `-C` option, like so:
>
> git -C super submodule foreach --recursive git reset --hard
>
> Then you do not need the subshell, and neither the `cd`. It would become a
> one-liner.
Alright, I have to admit I wasn't aware of that option.
Show 10 quoted lines
>
> However, what is less obvious to me is that this would catch the
> regression, as I do not see from the context whether the current submodule
> structure is deep enough to trigger the reported problem. If I understand
> the commit message correctly, `super` would have to contain a submodule
> that itself contains a submodule.
>
> If there was only one level of submodules (and from the context of this
> diff, it is not clear whether that is the case), the test case would pass
> even without the code change to `submodule.c`.
This is not entirely correct, I think. In the case where we found the error, no nested submodules were present. The buildkite agent however, due to the mere presence of submodules, still calls git submodule with the recursive flag. Inside submodule-helper the next level of the submodule-helper is called again, without checking for the presence of nested submodules. Hence, one level of submodules should be enough for now.
However, in sight of making the test more robust, one should actually use at least a two level deep git for checking, so that in future no potential false positives are created. That is, if the submodule-helper suddenly starts checking for the presence of nested submodules, before calling its next iteration.
Show 12 quoted lines
>
> Of course, I can always dig deeper and find out myself (and of course I
> did exactly that). But in my mind, that points to something we can
> improve.
>
> What I found is that the test case indeed fails without the fixed
> `builtin/submodule.c`, but that the nested submodule does not even need to
> be checked out, contrary to what I expected after reading the commit
> message.
>
> And in fact, the nested submodule is not even checked out in the test
> script!
The reasons for these points are explained by the text above, as the submodule-helper does not check for the presence of nested submodules before calling its next iteration.
Show 48 quoted lines
>
> To make this test case more obvious, and at the same time to test a little
> more thoroughly, maybe it would make sense to initialize that "inner"
> submodule (in this test script, `super/nested1/nested2`), then make it
> dirty by changing a file before the `reset --hard`, and afterwards verify
> that the file in question was successfully reset.
>
> That way, the test case would start to fail if anybody changed the script
> in a way where the submodule nesting was all of a sudden no longer deep
> enough to verify what the test case wants to verify.
>
> Otherwise we would risk that this test case would start passing for the
> wrong reasons at some stage.
>
> What I have in mind would look somewhat like this:
>
> : make sure that nested2 is initialized &&
> git -C super/nested1 submodule update --init nested2 &&
>
> : make sure that nested2 is dirty &&
> echo dirty >super/nested1/nested2/file &&
> test_must_fail git -C super/nested1/nested2 update-index --refresh &&
>
> git -C super submodule foreach --recursive git reset --hard &&
> : now nested2 is clean &&
> git -C super/nested1/nested2 update-index --refresh
>
>
> I might be overthinking this, though. Maybe it would be enough to make
> sure that nested1/nested2 is a nested submodule, e.g. by something like
> this:
>
> is_submodule () {
> case "$(git -C "${1%/*}" ls-files --stage "${1##*/}")" in
> 160000*) return 0;;
> *) return 1;;
> esac
> } &&
> is_submodule super/nested1 &&
> is_submodule super/nested1/nested2 &&
> git -C super submodule foreach --recursive git reset --hard
>
> which has the advantage of looking shorter, but it does not really verify
> that `git reset --hard` *has* been working correctly in nested2: it did
> not, as that nested submodule was not even initialized at that point.
>
> So I dunno... What do you think? How can we make this test case both more
> understandable and more robust against future edits at the same time?My test so far was designed to not actually check whether git reset --hard has shown any effect. I think other tests in the test suite exist already, testing for the correct execution of the command in each submodule. See for example "test messages from "foreach --recursive" from subdirectory'" and following.
This is why I think the second test of yours would be totally sufficient to test the introduced changes. That is of course only in combination with the already existing tests, whose testing functionality will remain. (I think that is a safe assumption.)
However, I think that your test might be a little bit too much, comparing it to the other tests of the suite.
Taking the test "test "foreach --quiet --recursive"" and the test "option-like arguments passed to foreach commands are not lost" for example, I suggest the following:
git -C clone2 submodule foreach --recursive "echo be --hard" > expected &&
git -C clone2 submodule foreach --recursive echo be --hard > actual &&
grep -sq -e "--hard" expected &&
test_cmp expected actual
By using clone2 we can be sure that we have a fully initalized git setup with at least two levels of submodules, as it is also used by several previous tests. By grepping the expected we can also be sure that the echo command was correctly executed as reference. Finally, comparing the actual output with the expected output then shows that the option is also correctly passed without using the "".
As final comment: One could change the flag --hard to something which will definetely never be an option flag for both, echo and git submodule foreach, e.g. --this-will-never-be-an-option.
Please tell me what you think about the proposed test.
Best regards,
MorianShow 10 quoted lines
>
> Ciao,
> Johannes
>
> > > +'
> > > +
> > > test_done
> > > --
> > > gitgitgadget
> >
Morian Sonnet via GitGitGadget
