Date: Sat, 16 Oct 2021 13:29:34 +0200 From: Felix Palmen <felix@palmen-it.de> To: freebsd-ports@FreeBSD.org Subject: About GIT and committing submissions Message-ID: <20211016112934.fnuderd67aprqjyb@nexus.home.palmen-it.de>
next in thread | raw e-mail | index | archive | help
--ineobxab2s6fetw6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi all,
since the transition to GIT, there's a way to have author information of
a commit in the VCS' own metadata, so the commit message metadata field
'Submitted by:' shouldn't be used any more. But in practice, I see a
nice mixture of
* Using GIT's --author info
* Using 'Submitted by:'
* Even using 'Reported by:' in combination with 'PR:'
In order to make this more consistent, I'd suggest a few additional
guidelines:
* For contributors:
- As the preferred format for submissions, use 'git format-patch'. Of
course, a plain patch is still ok, and for complex submissions, taking
them to phab is still preferred.
- If you want to submit a series of commits that isn't complex enough
for phab, just concatenate the files created by 'git format-patch'.
* For committers:
- If the submission is in 'git format-patch' format, use 'git am' to
apply it and, if necessary, edit the commit message(s) with 'git
commit --amend'.
- Otherwise, use the '--author' flag to 'git commit' when committing the
change.
BTW, shouldn't submissions in shar format be removed from the porter's
handbook entirely? I personally think they're cumbersome for both the
contributor and the committer.
So, what do you think?
BR, Felix
--=20
Dipl.-Inform. Felix Palmen <felix@palmen-it.de> ,.//..........
{web} http://palmen-it.de {jabber} [see email] ,//palmen-it.de
{pgp public key} http://palmen-it.de/pub.txt // """""""""""
{pgp fingerprint} A891 3D55 5F2E 3A74 3965 B997 3EF2 8B0A BC02 DA2A
--ineobxab2s6fetw6
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEqJE9VV8uOnQ5ZbmXPvKLCrwC2ioFAmFqt5YACgkQPvKLCrwC
2irS+gf/bNwKa34g6Z153IVDqV94HGx9VS7v+E2XrpJYOSiUsHc19UPVdBRccLJU
J6lvcst633QRnD0NiSLltlWkTQW2QB7ncPgmio0ZYS4lrzocKOulk1vxfRi/xuc0
GNMV/1itMY0Jl1CTl7i+mwnyqLNtPG3/W3Hl4pSk9m/MautkM3tuEEXMcrtNorRn
t8bWCz26p5YKzKTHiZ9gfwYi/gF9EPXkiN9DnEHVr9dIui37LnTrTEYNmR6or8Dw
bWEEon0HDPEK1ZnQ3yM0gbDOX5cKQlM4VRIsIcfEL9tg/O/ATR1JK8FpK/QmXlkJ
MIr/PFHbk1AbwsdMOvNl7xyKJWj7yQ==
=KD1l
-----END PGP SIGNATURE-----
--ineobxab2s6fetw6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20211016112934.fnuderd67aprqjyb>