From owner-dev-commits-ports-main@freebsd.org  Fri Jun  4 11:57:41 2021
Return-Path: <owner-dev-commits-ports-main@freebsd.org>
Delivered-To: dev-commits-ports-main@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 60D2464D573;
 Fri,  4 Jun 2021 11:57:41 +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 4FxLqT1f2wz3Hk4;
 Fri,  4 Jun 2021 11:57:41 +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 206091CD10;
 Fri,  4 Jun 2021 11:57:41 +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 154Bvfr3013182;
 Fri, 4 Jun 2021 11:57:41 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 154Bvfp8013181;
 Fri, 4 Jun 2021 11:57:41 GMT (envelope-from git)
Date: Fri, 4 Jun 2021 11:57:41 GMT
Message-Id: <202106041157.154Bvfp8013181@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
 dev-commits-ports-main@FreeBSD.org
From: Mathieu Arnold <mat@FreeBSD.org>
Subject: git: 5147b3b5e10f - main - .hooks/prepare-commit-msg: Enhance
 commit-msg hook.
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/main
X-Git-Reftype: branch
X-Git-Commit: 5147b3b5e10fcd48d3679bd0e7b261f345440881
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-ports-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the main branch of the FreeBSD ports repository
 <dev-commits-ports-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-main>, 
 <mailto:dev-commits-ports-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-main/>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Help: <mailto:dev-commits-ports-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-main>, 
 <mailto:dev-commits-ports-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jun 2021 11:57:41 -0000

The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5147b3b5e10fcd48d3679bd0e7b261f345440881

commit 5147b3b5e10fcd48d3679bd0e7b261f345440881
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2021-06-04 11:53:38 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2021-06-04 11:57:25 +0000

    .hooks/prepare-commit-msg: Enhance commit-msg hook.
    
    If a single port is updated, the hook now pre-fills in an appropriate
    subject line.
---
 .hooks/prepare-commit-msg | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.hooks/prepare-commit-msg b/.hooks/prepare-commit-msg
index 88440fee43cc..00c27a46c36d 100755
--- a/.hooks/prepare-commit-msg
+++ b/.hooks/prepare-commit-msg
@@ -28,6 +28,25 @@ esac
 outfile=$(mktemp /tmp/freebsd-git-commit.XXXXXXXX)
 exec 3> "$outfile"
 
+if [ -z "$3" ]
+then
+  what=$(git diff-index --name-only --cached --diff-filter=ACMR HEAD|sed -Ee 's/^([^\/]+\/[^\/]+).*/\1/'|sort -u|xargs)
+
+  case $what in
+    *\ *)
+      # More than one port, do nothing
+      ;;
+    *)
+      # One port, prepare the commit message.
+      {
+	echo "# Uncomment and add a short description of why things changed."
+	echo "# $what: "
+	echo
+      } >&3
+      ;;
+esac
+fi
+
 # Create a commit message template from three parts:
 #
 # 1. The beginning of the git-provided template (up to the first comment-only