On Mon, Aug 6, 2018 at 8:48 AM SZEDER Gábor <szeder....@gmail.com> wrote:
> > @@ -922,7 +928,7 @@ test_expect_success 'submodule update clone shallow 
> > submodule' '
> >               sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules 
> > >.gitmodules.tmp &&
> >               mv -f .gitmodules.tmp .gitmodules &&
> >               git submodule update --init --depth=$commit_count &&
> > -             test 1 = $(git -C submodule log --oneline | wc -l)
> > +             test 1 = $(git -C submodule rev-list --count HEAD)
> >       )
> >  '
> >
> > @@ -938,7 +944,7 @@ test_expect_success 'submodule update clone shallow 
> > submodule outside of depth'
> >               test_i18ngrep "Direct fetching of that commit failed." actual 
> > &&
> >               git -C ../submodule config 
> > uploadpack.allowReachableSHA1InWant true &&
> >               git submodule update --init --depth=1 >actual &&
> > -             test 1 = $(git -C submodule log --oneline | wc -l)
> > +             test 1 = $(git -C submodule rev-list --count HEAD)
> >       )
> >  '
>
> These two hunks don't have the desired effect, because command
> substitutions used like this will hide the exit code anyway.  I'd
> suggest
>
>   git -C submodule log --oneline >out &&
>   test_line_count = 1 out
>
> instead, with the additional benefit of a nice error message on
> failure.

Ah, good point...and good suggestion.  I'll wait for further feedback
then resend with this change.

Reply via email to