From owner-dev-commits-src-all@freebsd.org Wed Dec 23 13:59:14 2020 Return-Path: Delivered-To: dev-commits-src-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 577C64BFF41; Wed, 23 Dec 2020 13:59: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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1FDy21lSz4tj5; Wed, 23 Dec 2020 13:59: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 38C921F25E; Wed, 23 Dec 2020 13:59:14 +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 0BNDxELG093699; Wed, 23 Dec 2020 13:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BNDxENj093698; Wed, 23 Dec 2020 13:59:14 GMT (envelope-from git) Date: Wed, 23 Dec 2020 13:59:14 GMT Message-Id: <202012231359.0BNDxENj093698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a62107ed19a1 - make the git commit message template more compact MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a62107ed19a1095158f454132a3b6ec536a4de7c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for all branches of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2020 13:59:14 -0000 The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a62107ed19a1095158f454132a3b6ec536a4de7c commit a62107ed19a1095158f454132a3b6ec536a4de7c Author: Ed Maste AuthorDate: 2020-12-23 13:58:17 +0000 Commit: Ed Maste CommitDate: 2020-12-23 13:58:17 +0000 make the git commit message template more compact git's default commit message includes the list of staged, unstaged, and untracked files; adding our metadata tags and then their descriptions made for a very long template. Move the descriptions to the metadata lines themselves. Reviewed by: bcr Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D27664 --- tools/tools/git/hooks/prepare-commit-msg | 44 ++++++++++++-------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/tools/tools/git/hooks/prepare-commit-msg b/tools/tools/git/hooks/prepare-commit-msg index 9e623371447f..9dcb85cd1a3f 100755 --- a/tools/tools/git/hooks/prepare-commit-msg +++ b/tools/tools/git/hooks/prepare-commit-msg @@ -28,36 +28,26 @@ outfile=$(mktemp /tmp/freebsd-git-commit.XXXXXXXX) cat >$outfile < +# Submitted by: +# Reported by: +# Reviewed by: +# Approved by: +# Obtained from: +# MFC after: +# MFH: +# Relnotes: +# Security: +# Sponsored by: +# Pull Request: /pull/###> +# Differential Revision: # -# Description of fields to fill in above: 72 columns --| -# PR: If and which Problem Report is related. -# Submitted by: If someone else sent in the change. -# Reported by: If someone else reported the issue. -# Reviewed by: If someone else reviewed your modification. -# Approved by: If you needed approval for this commit. -# Obtained from: If the change is from a third party. -# MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. -# MFH: Ports tree branch name. Request approval for merge. -# Relnotes: Set to 'yes' for mention in release notes. -# Security: Vulnerability reference (one per line) or description. -# Sponsored by: If the change was sponsored by an organization. -# Pull Request: https://github.com/freebsd//pull/### (*full* GitHub URL needed). -# Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed). +# "Pull Request" and "Differential Revision" require the *full* GitHub or +# Phabricator URL. $(awk '/^#$/,EOF' $1) EOF