W dniu 24.12.2020 o 03:01, Jonathan Chen pisze: > Hi, > > With the transition to git, I'm now getting a lot of prompts for > differences against an empty $FreeBSD$, eg: > > *** Displaying differences between installed version and ./.cshrc: > > --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 > +++ ./.cshrc 2020-12-24 14:52:16.751245000 +1300 > @@ -1,4 +1,4 @@ > -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ > +# $FreeBSD$ > # > # .cshrc - csh resource script, read at beginning of execution by each shell > # > > While I can simply run a "mergemaster -F" to get past this particular > update, how will mergemaster operate in the future when there are > changes in /etc if it can't inspect the $FreeBSD$ tag anymore? > > Cheers. >
We can still make use of these $FreeBSD$ tags with Git clean and smudge filters.[1] This will help to keep the track of files updated by mergemaster(8) or etcupdate(8). The whole work can be done at user/administrator level. No need to bother committers, core@, re@ etc. Apparently, neither mergemaster nor etcupdate really needs these $FreeBSD$ tags, but we still _have_ them[2]. The ongoing discussion about removing them makes me really anxious, why not use them to make something profitable at the user level. I have done some tests with clean/smudge on stable/12 and head branches and I find these tags really useful after the transition to Git. With a bit modified scripts from Git documentation examples[1] it is possible to regenerate these tags for example in the following form: # $FreeBSD: 7d69f46f647 g...@freebsd.org Sat Dec 19 09:55:02 2020 +0000$ When the build system utilizes the same local Git repository configured for builds, then the tags will be updated only with new commits regarding tagged files. However, the info provided in them can be misleading, especially after recreation of local repository and initial checkout or after running "git gc" in the repo. Anyway, it _can_ really help the administrator to keep track of files updated by mergemaster or etcupdate. [1] https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes [2] https://lists.freebsd.org/pipermail/dev-commits-src-all/2020-December/000369.html Regards, -- Marek Zarychta
OpenPGP_signature
Description: OpenPGP digital signature
