Am 04.05.21 um 11:46 schrieb Mathieu Arnold: > 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: ================================================================ >>>> remote: Do not commit ports without TIMESTAMP in their distinfo files. >>>> remote: Rerun make makesum to add it. >>>> remote: ================================================================ >>>> 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. >>> >>> 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. >> >> 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. >> >> Did you try "git log multimedia/transcode"? >> >> 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.
Yes, sure, but the general advice when moving around files in GIT repositories is: First move and commit unchanged, then modify in place and commit again. And I was under the impression that the same advice applies to files that have been deleted and are brought back - GIT can identify and reconnect them in a way that preserves history only by guessing, and I wanted to make it as easy as possible for GIT, since I have watched GIT to get trivial operations of that kind wrong in grotesque ways ... https://github.blog/2020-12-17-commits-are-snapshots-not-diffs/#since-commits-arent-diffs-how-does-git-track-renames
OpenPGP_signature
Description: OpenPGP digital signature