From nobody Fri Dec 16 23:44:35 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 4NYm0g5y4Qzt3Vy; Fri, 16 Dec 2022 23:44:35 +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 4NYm0g4lcnz4JWB; Fri, 16 Dec 2022 23:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671234275; 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=GNXmCBbvTAAIwHL6tIFgrKAP6XodmXIdbv1cDcsh5PM=; b=xDDR9uRbOcJi19kVFMCNI+IAXmdVok/QVIUTuwIICFJjyxJ4DnSKzNZBuNJ2wAvlptr3hx IWYKlh/fhfUH35bFTBaBUiDtNfKYUccXRjKSreyX7wR0WMPWJDUlRjTEknyS19O0ryhrh1 DKbHOxpNBl8k1ikX8aEk2zdG2rGPLA22X2gKUAM3ek+QSdl3a7SdTvHFcFiUmnHlzjFMNJ 7sDVm0qhgPuzAocN8zTAqEWpXvgI5ZWNOHUkQCdnfy6bng8GtYRzoEoYPtZb5sUdGgFDk3 CiFU0Iu5gIRxQ4ya4kF7Jn8XNFB27xErMYALVUKdjg4uFXMxnNWaiBMJ2OnpFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671234275; 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=GNXmCBbvTAAIwHL6tIFgrKAP6XodmXIdbv1cDcsh5PM=; b=TAJvFqEcnp5wpJy7rz6EDDcubH7HHtriWtiDzgrtrOhfh/WaPwDWIyQlyaKLitodElSSTX SqS+unhby/CXfSPvwlc2mPbqMmbo+W9k8LVBIcOA/8uf1sc4a68t4s8a3k3cDbhWud1/jb s2xxvDp7D+X0RyZqFH+fAxfTNYucL5YqAonLYcYBcuG1vOGQvQTd4nhf8Bgr3+zUW4Q4W0 XxQzZJk7GeU1Zz7sZuUdhiCSGwiKGDx+aEBeQh1IKY0CKjF9VwaKJVbUhcpWSlI/VVVxXP kYwxCF4yUrCoYdlrBQ1E2swhu/doM9Yp9IRAxkk70Vn4Df63YybU1D6IxbcQRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671234275; a=rsa-sha256; cv=none; b=oikc+VPMrkRfo8t1nLo39xIQt94BsCAD/CyZyugtui1ctN9oAlhS4tO/va2r1rr0cIgPJ5 dLsBbRUhqcTGXQ06DDPC4NbcDd+ogxcjlRmXBvJSYkjrqNpq6zz1BdN8TxoMQ6BEJ4peF4 jzgQQMhpB+4PiL7U5159pdWrtTWojemRWBpRCOsuaHTYmhyNQtVd6a42ZMbj8BQRJ2V9qD KdQIqXpyfBq5msH9SchS2H61EzOpfdnKCcJXdMd7W2MZSOQGI19Yg5kjJm5dnD6zBQ1Jxz mXha1i4EzOwh/aOes732EPsR4/PSIq0DlYOXxZ9lnvh/p+pNRybxBS/YXnNpmw== 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 4NYm0g3MGFzWkk; Fri, 16 Dec 2022 23:44:35 +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 2BGNiZCV098368; Fri, 16 Dec 2022 23:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BGNiZmK098367; Fri, 16 Dec 2022 23:44:35 GMT (envelope-from git) Date: Fri, 16 Dec 2022 23:44:35 GMT Message-Id: <202212162344.2BGNiZmK098367@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: df32a2be1da4 - main - .hooks/pre-commit.d: Revert "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: df32a2be1da47432c17e4424c3482a23aade7d9c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=df32a2be1da47432c17e4424c3482a23aade7d9c commit df32a2be1da47432c17e4424c3482a23aade7d9c Author: Matthias Andree AuthorDate: 2022-12-16 23:40:34 +0000 Commit: Matthias Andree CommitDate: 2022-12-16 23:42:36 +0000 .hooks/pre-commit.d: Revert "unbreak EPOCH checker" This reverts commit e0dd1e987a5eaa27cf7b46043db663ff51b1cdc2. No consensus yet, and escaped after messing up my branches. --- .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 34d93e2efcf4..1a59a39b5407 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}" -a -n "${old_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}" ] ; then echo "[pre-commit] dropped PORTEPOCH ${old_epoch} in ${makefile}" exit 1 fi