Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0

On 10 Aug 2023, at 03:32, Enji Cooper <ngie@FreeBSD.org> wrote:
> 
> The branch main has been updated by ngie:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=28f6c2f292806bf31230a959bc4b19d7081669a7
> 
> commit 28f6c2f292806bf31230a959bc4b19d7081669a7
> Author:     Enji Cooper <ngie@FreeBSD.org>
> AuthorDate: 2023-08-08 06:17:32 +0000
> Commit:     Enji Cooper <ngie@FreeBSD.org>
> CommitDate: 2023-08-10 09:32:33 +0000
> 
>    Import GoogleTest 1.14.0

This should be a merge commit from the vendor branch but isn’t.

>    GoogleTest 1.14.0 now requires C++14 to build. Change
>    `googletest.test.inc.mk` to reflect this requirement.
> 
>    Adjust the build integration logic to handle the new version of
>    GoogleTest (add/remove headers/sources as needed).
> 
>    Tighten down warnings via `CXXFLAGS.clang` instead of ignoring all
>    warnings. Some new warnings snuck in after I did my last round of fix
>    submissions upstream.
> 
>    Also address some overlinking added in the previous version import by
>    removing superfluous libraries.
> 
>    ===============================
> 
>    Expect WhenDynamicCastToTest.AmbiguousCast to fail
> 
>    This change reapplies the expected failure from 1.10.0.
> 
>    Ref: https://github.com/google/googletest/issues/2172
> 
>    MFC after:      2 weeks
>    Reviewed by:    asomers, emaste
>    Differential Revision:  https://reviews.freebsd.org/D41399
> 
>    Merge commit '8ef491440fcaec96f899d73e08873426c78583a4' into googletest-v1.14.0-import

What’s this thing? Sounds like you did some merging, squashing and
rebasing, didn’t fix up the commit message and didn’t notice that git
rebase eats merges? See [1] for how to do this properly.

Jess

[1] https://docs.freebsd.org/en/articles/committers-guide/#_rebasing_your_change_against_latest_freebsd_source_tree