Re: git: 413c5e9082a7 - main - Merge remote-tracking branch 'freebsd/vendor/Linux/ath-common'

From: Warner Losh <imp_at_bsdimp.com>
Date: Tue, 24 Sep 2024 21:48:05 UTC
On Tue, Sep 24, 2024 at 3:33 PM Jessica Clarke <jrtc27@freebsd.org> wrote:

> On 24 Sep 2024, at 22:19, Bjoern A. Zeeb <bz@FreeBSD.org> wrote:
> >
> > The branch main has been updated by bz:
> >
> > URL:
> https://cgit.FreeBSD.org/src/commit/?id=413c5e9082a7d1d25fd3a95f0e77a949621f1433
> >
> > commit 413c5e9082a7d1d25fd3a95f0e77a949621f1433
> > Merge: 604919c47fa4 9c6b6723ca84
> > Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
> > AuthorDate: 2024-09-24 21:06:19 +0000
> > Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
> > CommitDate: 2024-09-24 21:06:19 +0000
> >
> >    Merge remote-tracking branch 'freebsd/vendor/Linux/ath-common'
> >
> >    Sponsored by:   The FreeBSD Foundation
>
> Hi Bjoern,
> This slew of merge commits has zero context for what they’re actually
> importing beyond the branch name, which goes against the documentation
> for how to do vendor imports:
>
> > Include details about the changes being merged in the merge commit
> message.
> --
> https://docs.freebsd.org/en/articles/committers-guide/#_updating_the_freebsd_source_tree
>
> This is unhelpful for anyone wanting to understand what you’re doing.
>

Agreed. However, I looked at these commits. This is bootstrapping vendor
branches for software
that had been directly added to the tree before. I should have had Bjoern
mention this in these
merge commits, but it didn't occur to me until after the commit.

Warner