From owner-freebsd-ports@freebsd.org Mon May 3 07:01:37 2021 Return-Path: Delivered-To: freebsd-ports@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 E551D6292D0 for ; Mon, 3 May 2021 07:01:37 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FYYmd602Sz4WsQ; Mon, 3 May 2021 07:01:37 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [IPv6:2a01:678:4:1::228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id AB49925004; Mon, 3 May 2021 07:01:37 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:50:2d91:83ac:13c:768c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 3EB42942D80; Mon, 3 May 2021 07:01:35 +0000 (UTC) Date: Mon, 3 May 2021 09:01:34 +0200 From: Mathieu Arnold To: Stefan Esser Cc: FreeBSD ports Subject: Re: [SOLVED?] Recovery of deleted ports fails due to pre-commit checks Message-ID: <20210503070134.bydnbc2eah7st2on@aching.in.mat.cc> References: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="hnsifsslb7u3wj7q" Content-Disposition: inline In-Reply-To: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org> X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2021 07:01:38 -0000 --hnsifsslb7u3wj7q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, May 01, 2021 at 09:01:02PM +0200, Stefan Esser wrote: > The recovery of deleted ports in their previous form is rejected > by the pre-commit checks on the repository server: >=20 > remote: > remote: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > remote: Do not commit ports without TIMESTAMP in their distinfo files. > remote: Rerun make makesum to add it. > remote: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > remote: >=20 > I have tried to revert the deletion with unchanged files and then > updated the ports' Makefiles and distinfo files in a later commit. >=20 > Pushing those commits all together fails with the message above, > and in order to not confuse GIT, deleted files should be committed > first, before applying any changes. This is not needed at all, Git cannot get confused by something it has no knowledge of. Once a file is deleted, or moved, the history tracking stops. --=20 Mathieu Arnold --hnsifsslb7u3wj7q Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmCPn8lfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgJeAA//Qd3yeNY3XxCFxHvi5Lcbtd9EsUPpS5zViULdcsViz/IHtpG8vvYV0Wn0 aw5rg8cDld6WOD+PXqvqnQv5lR/ZacMMlae074yyEqUHSokmQelY3cpfbjnLJy/u 1RGrjCKUnym7b9mbUqDF6Dv/tmXtSQ8qprLlaGIv3g3PmHm5c60ccGjE9X806ans kx/Ac+A0a/uepCZDI7BeFTu/M0BkPHK2+LSty2z6pfaeOKwfWutUTPZX9LkKFx2O /H/6LW6/si15GSbbq08KAp0caoOwWoBUH6bWHIt8WVyUay9zLo4Jnb/r12zAMPCJ kf1la9kCqZPNQAkvUtIrpBvvy4LS3kZIoaBP72Y6KJCM0jAW+TUFvqTiL4fPkHVc qhVDcHiZndT54Nnu/UAQeZTGdxg2A7TuDC+HJ1CEkwOgMPw4zy/ZU2UpxDRTMdaR 2EKlGj+50s0spI7CLsb+OZd5RrSWerkKN7vXUMNPDltNVOp6fiuSgxURC3rxcLUO vVzPo5ML2QQWKvYOd826NjxM9IwK4Wt/ZiajOnTGPlMPO9E0jF2JKSrssQUGEmDn wvw5Fj91RKCcYhs6i65KJgfg/RWoRLfY2gwmVzhGKzPUeUyr9XPsqU5EX7Uiyd0m ubdJXO7rmjsu6pbBJ3D9lvn7cXUoGN8ZXE3qOpZJyhf6S0QNsbM= =iiQu -----END PGP SIGNATURE----- --hnsifsslb7u3wj7q--