From owner-dev-commits-ports-all@freebsd.org Fri Jun 4 12:04:14 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4311464DBA3; Fri, 4 Jun 2021 12:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FxLz20Zb2z3L7h; Fri, 4 Jun 2021 12:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC5C91CE96; Fri, 4 Jun 2021 12:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 154C4DaI027792; Fri, 4 Jun 2021 12:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 154C4DGV027791; Fri, 4 Jun 2021 12:04:13 GMT (envelope-from git) Date: Fri, 4 Jun 2021 12:04:13 GMT Message-Id: <202106041204.154C4DGV027791@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mathieu Arnold Subject: git: 196cb1deb76c - 2021Q2 - githooks: Rework authorship instructions. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 196cb1deb76c167cc1a853917dec42184b773d8b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2021 12:04:14 -0000 The branch 2021Q2 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=196cb1deb76c167cc1a853917dec42184b773d8b commit 196cb1deb76c167cc1a853917dec42184b773d8b Author: Mathieu Arnold AuthorDate: 2021-04-22 09:47:14 +0000 Commit: Mathieu Arnold CommitDate: 2021-06-04 12:03:44 +0000 githooks: Rework authorship instructions. While there, move them upwards so they are not hidden at the far end of the template. (cherry picked from commit 5b7c17856512900d2a13be547869b734a527a57b) --- .hooks/prepare-commit-msg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.hooks/prepare-commit-msg b/.hooks/prepare-commit-msg index e4e94960988e..12f26c74d0b6 100755 --- a/.hooks/prepare-commit-msg +++ b/.hooks/prepare-commit-msg @@ -44,6 +44,9 @@ $(awk '1;/^#$/{exit}' "$1") # # 72 columns --| # +# Do not add a Submitted by line. If someone besides the committer sent in the +# change, the commit author should be set using \`git commit --author\`. +# # Uncomment and complete these metadata fields, as appropriate: # # PR: @@ -61,8 +64,7 @@ $(awk '1;/^#$/{exit}' "$1") # Differential Revision: # # "Pull Request" and "Differential Revision" require the *full* GitHub or -# Phabricator URL. The commit author should be set appropriately, using -# \`git commit --author\` if someone besides the committer sent in the change. +# Phabricator URL. $(awk '/^#$/,EOF' "$1") EOF