Date: Sat, 16 Oct 2021 14:11:38 +0200 From: Robert Clausecker <fuz@fuz.su> To: freebsd-ports@freebsd.org Subject: Re: About GIT and committing submissions Message-ID: <YWrBejhQUTfsZgqO@fuz.su> In-Reply-To: <20211016112934.fnuderd67aprqjyb@nexus.home.palmen-it.de> References: <20211016112934.fnuderd67aprqjyb@nexus.home.palmen-it.de>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi,
I support your proposed guidelines for using git.
However, I would like to keep the shar guidelines. Submitting a port as a
shar is a very simple way to do so if you have not set up a complete
development environment with git. If you don't have your ports tree under
git, it is difficult to produce a new port as a git-style patch.
Yours,
Robert Clausecker
Am Sat, Oct 16, 2021 at 01:29:34PM +0200 schrieb Felix Palmen:
> 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
>
> --
> 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
--
() ascii ribbon campaign - for an 8-bit clean world
/\ - against html email - against proprietary attachments
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YWrBejhQUTfsZgqO>