From nobody Sat Oct 16 12:11:38 2021 X-Original-To: freebsd-ports@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C50DD17F54BA for ; Sat, 16 Oct 2021 12:11:47 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "amnesiac", Issuer "amnesiac" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HWhnv0Nypz4gYW for ; Sat, 16 Oct 2021 12:11:46 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.16.1/8.16.1) with ESMTPS id 19GCBc2N061324 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sat, 16 Oct 2021 14:11:38 +0200 (CEST) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.16.1/8.16.1/Submit) id 19GCBcqU061323 for freebsd-ports@freebsd.org; Sat, 16 Oct 2021 14:11:38 +0200 (CEST) (envelope-from fuz) Date: Sat, 16 Oct 2021 14:11:38 +0200 From: Robert Clausecker To: freebsd-ports@freebsd.org Subject: Re: About GIT and committing submissions Message-ID: References: <20211016112934.fnuderd67aprqjyb@nexus.home.palmen-it.de> List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211016112934.fnuderd67aprqjyb@nexus.home.palmen-it.de> X-Rspamd-Queue-Id: 4HWhnv0Nypz4gYW X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of fuz@fuz.su designates 2001:41d0:8:e508::1 as permitted sender) smtp.mailfrom=fuz@fuz.su X-Spamd-Result: default: False [-1.29 / 15.00]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.985]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+a]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-ports@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; DMARC_NA(0.00)[fuz.su]; NEURAL_SPAM_SHORT(1.00)[1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N 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 ,.//.......... > {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