Date: Sun, 4 Dec 2022 11:31:14 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 282db8d4189a - main - Tools/scripts: note that you should also be in sync with origin/main Message-ID: <202212041131.2B4BVE8b065172@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=282db8d4189a09a4b89079e9ee62ba1122e59756 commit 282db8d4189a09a4b89079e9ee62ba1122e59756 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2022-12-04 11:29:43 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2022-12-04 11:29:43 +0000 Tools/scripts: note that you should also be in sync with origin/main --- Tools/scripts/rmport | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/scripts/rmport b/Tools/scripts/rmport index b8757712bacf..30d8e219441d 100755 --- a/Tools/scripts/rmport +++ b/Tools/scripts/rmport @@ -366,7 +366,7 @@ else cd "${git_dir}/.." || exit 1 fi if ! ${GIT} diff --exit-code remotes/origin/main ; then - echo "you have local commits, exiting" >&2 + echo "you have local commits or are behind origin/main, exiting" >&2 exit 65 fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212041131.2B4BVE8b065172>