Date: Fri, 16 Dec 2022 23:44:35 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: df32a2be1da4 - main - .hooks/pre-commit.d: Revert "unbreak EPOCH checker" Message-ID: <202212162344.2BGNiZmK098367@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=df32a2be1da47432c17e4424c3482a23aade7d9c commit df32a2be1da47432c17e4424c3482a23aade7d9c Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2022-12-16 23:40:34 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212162344.2BGNiZmK098367>