From nobody Fri Dec 16 22:52:40 2022 X-Original-To: dev-commits-ports-main@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 4NYkrn1RW8zswmc; Fri, 16 Dec 2022 22:52: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 4NYkrn10BSz4Fqq; Fri, 16 Dec 2022 22:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671231161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+uYPflyImV1g7V2lzW4qvtju2bCTqr/RnErx57obXA=; b=FelSJyFvcG9B1AA17RnJ7GGxv6sZuuuDLaEK6befYyOx7NeOnLxF5LYkYychfL2KxRwAKG g24uN4C84+I6jhHsCaxOWYZMHqu78zJjVa4zMRuGZSUJpGenefLIuZXejYnqhtr3qBgDvm r9yVywWw5Ztkeh1PYfAXysVpPhO/CqGNKsn/J1LlYCyRhfYktE6lx5WredQUXuSdOh0Q5E sPsV2ahV3BK7T0z/kBlZXXM8ictZ5uUyrXq8eU1XOiBNwKtIGwzu8wQCYxNJcTHYypdD1K BVpFRTontUKR5krT5h875pTaJ9pFV/CzGzY4/2ycrjjql8BvZeX0byXphEItrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671231161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+uYPflyImV1g7V2lzW4qvtju2bCTqr/RnErx57obXA=; b=u/Y7lg1vndYXia0HVCGFlOq6AqGZnxPh/t8UlMH8vNRDSMu7YnQgsab2y7zQsTbEaqQTTk QBCobJBrkG45Qd4JlnfbX+okcWgLO1ID7eXSvqOiXZQjvlj8td/6woCu5UOnUhPZjznMnH 5dPR+UqMNauA+85zn3o4hKyHDtCXGVJZulcn8s9mLdZeXicqoQn1QN8EFgZfn2XEbV6UkX X6uUZ+An5bgnP/se6WmAU9oande08/Ui2eJ7Q9CkFV9ejQ5N/I0tXfbTArTjXq1pMAIUfD YFXYz8MDSt5lOrNvav0Z2vM9fWZoc6TFMfSudocoXntImflnQk579Ht+yE9RLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671231161; a=rsa-sha256; cv=none; b=LsCqVKWBWbE7jE262xM39hxpdlM30+7cdTZXeROp0YsAnXzsov7806WOXYTfoX+zAtLVaq hMWg5647XwvutmfaXrcLIvkyTkR+jYwhN8cKOhRHgLOfTIhZATTmG8vI4+wxQfJCFkAvT1 wNpk4CQ+Obnf8FUZ/U2/FXJQ41bdRXi8Gysu3Zp1Xa3pOhttm5xW8+8uLfsnOoQ3Aumfmh QHvhOWjVISB4ngPHf39M58FNk4LsmAPyDbyC/7U6rsjJv9vpdWG/tK6U/Q8bqNp3aROetg C59AjEhZI61Dc8JMacBWnMRHBMa3LGXgd4FUJFfquS21cqkFWZgAkZW8EfoD3g== 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 4NYkrn03tdzVNd; Fri, 16 Dec 2022 22:52: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 2BGMqeRj026233; Fri, 16 Dec 2022 22:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BGMqerj026232; Fri, 16 Dec 2022 22:52:40 GMT (envelope-from git) Date: Fri, 16 Dec 2022 22:52:40 GMT Message-Id: <202212162252.2BGMqerj026232@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: e0dd1e987a5e - main - .hooks/pre-commit.d: unbreak EPOCH checker List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0dd1e987a5eaa27cf7b46043db663ff51b1cdc2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0dd1e987a5eaa27cf7b46043db663ff51b1cdc2 commit e0dd1e987a5eaa27cf7b46043db663ff51b1cdc2 Author: Matthias Andree AuthorDate: 2022-11-27 12:51:51 +0000 Commit: Matthias Andree CommitDate: 2022-12-16 22:08:29 +0000 .hooks/pre-commit.d: unbreak EPOCH checker dns/dnsmasq-devel as of 2.88rc3 contained a comment about PORTEPOCH, which I removed in the 2.88rc5. This tripped up the checker because it assumed that if git yielded lines containing PORTEPOCH, then it must have been PORTEPOCH= or similar lines. Untrue in my case. It was printing [pre-commit] dropped PORTEPOCH in dns/dnsmasq-devel/Makefile To solve, only pick out PORTEPOCH diffs that are actual assignments, and if the new PORTEPOCH is empty, and the old one is also, ignore this condition (previously we would exit 1, which is bogus). Also, grep without -E should not have \ in front of - or +. FreeBSD 13.1 grep is fine, but GNU grep ignores those backslashes noisily (and I have prepended it to PATH) and emits warnings. --- .hooks/pre-commit.d/check_portepoch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.hooks/pre-commit.d/check_portepoch b/.hooks/pre-commit.d/check_portepoch index 1a59a39b5407..34d93e2efcf4 100755 --- a/.hooks/pre-commit.d/check_portepoch +++ b/.hooks/pre-commit.d/check_portepoch @@ -5,9 +5,9 @@ check_epoch() { local makefile="$1" - local old_epoch=$(git diff --cached -U0 "${makefile}" | grep '^\-PORTEPOCH' | grep -oE '[0-9]+') - local new_epoch=$(git diff --cached -U0 "${makefile}" | grep '^\+PORTEPOCH' | grep -oE '[0-9]+') - if [ -z "${new_epoch}" ] ; then + local old_epoch=$(git diff --cached -U0 "${makefile}" | grep '^-PORTEPOCH.*=' | grep -oE '[0-9]+') + local new_epoch=$(git diff --cached -U0 "${makefile}" | grep '^+PORTEPOCH.*=' | grep -oE '[0-9]+') + if [ -z "${new_epoch}" -a -n "${old_epoch}" ] ; then echo "[pre-commit] dropped PORTEPOCH ${old_epoch} in ${makefile}" exit 1 fi