Date: Tue, 24 Sep 2024 15:48:05 -0600 From: Warner Losh <imp@bsdimp.com> To: Jessica Clarke <jrtc27@freebsd.org> Cc: "Bjoern A. Zeeb" <bz@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: 413c5e9082a7 - main - Merge remote-tracking branch 'freebsd/vendor/Linux/ath-common' Message-ID: <CANCZdfrATcWWTAPNCbNA6p6eEFHxk90SYBXLEQm9TOb6Jvo0YA@mail.gmail.com> In-Reply-To: <FF7AE8D8-525C-4CB1-88BE-800418E27F04@freebsd.org> References: <202409242119.48OLJOws002720@gitrepo.freebsd.org> <FF7AE8D8-525C-4CB1-88BE-800418E27F04@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000088d00a0622e4765b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Sep 24, 2024 at 3:33=E2=80=AFPM 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=3D413c5e9082a7d1d25fd3a95f0e77a94= 9621f1433 > > > > 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=E2=80=99re actu= ally > 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_free= bsd_source_tree > > This is unhelpful for anyone wanting to understand what you=E2=80=99re do= ing. > 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 --00000000000088d00a0622e4765b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Tue, Sep 24, 2024 at 3:33=E2=80=AF= PM Jessica Clarke <<a href=3D"mailto:jrtc27@freebsd.org">jrtc27@freebsd.= org</a>> wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"marg= in:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1e= x">On 24 Sep 2024, at 22:19, Bjoern A. Zeeb <bz@FreeBSD.org> wrote:<b= r> > <br> > The branch main has been updated by bz:<br> > <br> > URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D413c5e9082a7= d1d25fd3a95f0e77a949621f1433" rel=3D"noreferrer" target=3D"_blank">https://= cgit.FreeBSD.org/src/commit/?id=3D413c5e9082a7d1d25fd3a95f0e77a949621f1433<= /a><br> > <br> > commit 413c5e9082a7d1d25fd3a95f0e77a949621f1433<br> > Merge: 604919c47fa4 9c6b6723ca84<br> > Author:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org><br> > AuthorDate: 2024-09-24 21:06:19 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org><br> > CommitDate: 2024-09-24 21:06:19 +0000<br> > <br> >=C2=A0 =C2=A0 Merge remote-tracking branch 'freebsd/vendor/Linux/at= h-common'<br> > <br> >=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundation<br> <br> Hi Bjoern,<br> This slew of merge commits has zero context for what they=E2=80=99re actual= ly<br> importing beyond the branch name, which goes against the documentation<br> for how to do vendor imports:<br> <br> > Include details about the changes being merged in the merge commit mes= sage.<br> -- <a href=3D"https://docs.freebsd.org/en/articles/committers-guide/#_updat= ing_the_freebsd_source_tree" rel=3D"noreferrer" target=3D"_blank">https://d= ocs.freebsd.org/en/articles/committers-guide/#_updating_the_freebsd_source_= tree</a><br> <br> This is unhelpful for anyone wanting to understand what you=E2=80=99re doin= g.<br></blockquote><div><br></div><div>Agreed. However, I looked at these c= ommits. This is bootstrapping vendor branches for software</div><div>that h= ad been directly added to the tree before. I should have had Bjoern mention= this in these</div><div>merge commits, but it didn't occur to me until= after the commit.</div><div><br></div><div>Warner=C2=A0</div></div></div> --00000000000088d00a0622e4765b--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrATcWWTAPNCbNA6p6eEFHxk90SYBXLEQm9TOb6Jvo0YA>