Date: Tue, 4 May 2021 11:46:53 +0200 From: Mathieu Arnold <mat@freebsd.org> To: Stefan Esser <se@freebsd.org> Cc: Mathieu Arnold <mat@freebsd.org>, FreeBSD ports <freebsd-ports@freebsd.org> Subject: Re: [SOLVED?] Recovery of deleted ports fails due to pre-commit checks Message-ID: <20210504094653.3m27ucqa3hotsusw@aching.in.mat.cc> In-Reply-To: <6041a16c-a114-2896-7162-39b59110b782@freebsd.org> References: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org> <20210503070134.bydnbc2eah7st2on@aching.in.mat.cc> <6041a16c-a114-2896-7162-39b59110b782@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--m4sqvfwinasof6ph Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, May 03, 2021 at 09:54:36PM +0200, Stefan Esser wrote: > Am 03.05.21 um 09:01 schrieb Mathieu Arnold: > > 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: > >> > >> 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: > >> > >> I have tried to revert the deletion with unchanged files and then > >> updated the ports' Makefiles and distinfo files in a later commit. > >> > >> 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. > >=20 > > 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 > I wanted to re-connect the resurrected files to the history of the port. > And that works best, if unmodified files are committed first, changes > applied and committed thereafter. >=20 > Did you try "git log multimedia/transcode"? >=20 > The history is there, back to 2002. Yeah, but this has nothing to do with you commiting unmodified files. Git does not track file renames or moves (or resurrection), it blindly looks at what you told it and goes as far as it can find things. --=20 Mathieu Arnold --m4sqvfwinasof6ph Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmCRGAlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgKjSg/9FxrZgGvWK7U+YXALgKXKWY1dMxF8UdgODKyLfnrG/JgEotF6K3Zi7MJJ 1Dm4WtbZxyB1/SbdaNSGD2+qfmJrWhV4Q2hh8dMLNrufVjKQtyjktZLO3X+B08iz UcGF1UcvjLPeAiS9xGTdh8zrLiXtHgovEY9LGkqkdgRsIlSuwB8lfc8EE0ZQQ6od qFspDdebCWkkjuiTz3qYjdsf/8tvYYC579XivWexKZF58FzQDAF05fsF6GCGiuVC I3KRMOe/DDuIUwd9OxTW76R6HymTjhnzJrY/+YRLQLkBHmi6DTmk83AuhcZVvCSA 6X6Ymqir9zOQ7GuDsuCMmblpQREsagak/Lv8SMWDGGot9ST+F3zXBI+HEbpZ20DT 7Dck1VakauoBUKfFKB2ICxDWE3ieAigVBx7MEHzF/OJtEnPRgceajZByFEJFTk7p QxvP1wPzDJTmmErRJ5kBApqq1IzYc47Ged5sa1b43ZwOaqne70u1B2BVd5dsFfHM uq7GXsw3hZ7+MWxc3iNOnyc2FEcLzyxPFp7ymBS5/8h7qj+FLCmHV9IpXTiVrWEY r2U2kVWD0+0eza/TySjC+lmV/v5dPqyNnrMJn1zerCEwkNnpcxHcH22/YuWoJPVb 7nxlqvOAEuNzvZZyMNDAajotd/C1CBTWimdLBb8IVW9h5kbLiyk= =/+5R -----END PGP SIGNATURE----- --m4sqvfwinasof6ph--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210504094653.3m27ucqa3hotsusw>