Date: Wed, 10 Nov 2021 10:21:24 +0800 From: Philip Paeps <philip@freebsd.org> To: Larry Rosenman <ler@FreeBSD.org> Cc: doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org Subject: Re: git: 6952540fe7 - main - really update the expire date. Message-ID: <889D20FD-081C-48C4-BD0F-ABD6D0B6F6BA@freebsd.org> In-Reply-To: <0da0dc3c9002ffc3fe4f4cc71d260f80@FreeBSD.org> References: <202111090433.1A94XaUt022831@gitrepo.freebsd.org> <94C734B9-BD9E-4C08-9683-4CFDD5A0D100@freebsd.org> <371e31b54f70b85dc733a4059d6d3e9c@FreeBSD.org> <0da0dc3c9002ffc3fe4f4cc71d260f80@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=_MailMate_BA6D0D66-C353-48D7-9350-D3D3009A983C_=
Content-Type: text/plain; format=flowed; markup=markdown
On 2021-11-09 23:45:08 (+0800), Larry Rosenman wrote:
> On 11/09/2021 9:32 am, Larry Rosenman wrote:
>> On 11/09/2021 12:32 am, Philip Paeps wrote:
>>> On 2021-11-09 12:33:36 (+0800), Larry Rosenman wrote:
>>>> really update the expire date.
>>>
>>> For dealing with PGP in Git, I recommend this in $HOME/.gitconfig:
>>>
>>> [diff "gpg"]
>>> textconv = "f(){ gpg --list-packets < \"$1\" | grep -v \"^#
>>> off=\"; }; f"
>>>
>>> And adding "*.key diff=gpg" to .gitattributes.
>>>
>>> That'll show you what actually changed with 'git show' / 'git diff'
>>> etc. Because base64 encoded blobs are not particularly easy to read
>>> by themselves. :)
>>>
>>> Philip
>>
>> Is that .gitattributes in ~ or the root of the repository?
> Ok, it's in the doc root, but should it just be there untracked or
> sent up to the server?
Local, untracked is fine. I wouldn't push this since -- as far as I
know -- there is no way to provide a diff driver with the repo. And
even if there were, it would rely on gpg being installed.
If you've put that stanza in your $HOME/.gitconfig and added "*.key
diff=gpg" to .gitattributes, a "git show 6952540fe7" will show you
what's actually changed in your PGP key, rather than the base64 encoded
mess.
I think this:
- hashed subpkt 2 len 4 (sig created 2019-09-07)
- hashed subpkt 9 len 4 (key expires after 5y240d18h50m)
+ hashed subpkt 2 len 4 (sig created 2021-11-09)
+ hashed subpkt 9 len 4 (key expires after 6y304d1h21m)
is a little bit easier to read than this:
-BRUKCQgLBRYDAgEAAh4BAheAFiEEHjgknedhWzvJgwVzaXyZsatIp30FAl10KBsF
-CQqjcnEACgkQaXyZsatIp30hsAf/ZCpBXcVH3o81OFVcIjPx1TxaavCiKFN1Mm8b
-eFWp5kCIfuw4iI6LD/UDd3MWDWOF43a14EEsY655/EIzcVMwzKRkvy8bKvs1jp1u
-iTXJARhw4Q7k/V/MoLxl1/R9ZUT02rZ/a9V1tWvFS9z/QCHzYE2AgGy6hpIpJPor
-J41AbGxdTQLlW5ELzQYGgWFBfxgxZ7Cyf/faj6NXgnH6TdL0VvLwviGNXiat/Sds
-U/GfEBXBNkBQAVNRjq78eMazc2dNQ1itVLOuIzv/bkUGMV6u7UmqE4zh0QdUqqQs
-MVBH+tQRn+XS3w4u7Fp3kDND4xKW/2bp/StFu4D5y2HXfM0+KYkBPQQTAQoAJwUC
+BRUKCQgLBRYDAgEAAh4BAheAFiEEHjgknedhWzvJgwVzaXyZsatIp30FAmGJ+SkF
+CQzYD/8ACgkQaXyZsatIp32DOQgAokSxwXSwCAEb5GHWLVOBKzZaJXrwRttNRoLs
+KeJ1rnsIhwCtNI6AIIDjMxcRdUJlfVdgOV6TpzCYVYkgddFRFpJx/kDMd5UufmzE
+QCjt+Q1lyW0kN8bMXGBVJuE6GxSbkBTPfNhhk/o++j+sla3AxuyrxxqGlYlz2syq
+3/v4ZYEjSYnc2w+uJuOGAlYyl3vgXzr7yZ5MsdK90WpXfbp9IIdPYk3uaRLvkiHN
+kBD/lwZGx57A+YIh+bGCpMimAq3XiBLhUaNqMRyineBhas+q75Knhwf5MCVZgkCv
+F/DPmxc7fr5XvOf6EjXh7rCpvt5ET3lqrJkblodpa8tfLUmTbIkBPQQTAQoAJwUC
:)
(Of course, the base64 encoded data are committed. textconv only makes
the diffs look nicer for pre-commit / pre-push inspection.)
Philip
--
Philip Paeps
Senior Reality Engineer
Alternative Enterprises
--=_MailMate_BA6D0D66-C353-48D7-9350-D3D3009A983C_=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?889D20FD-081C-48C4-BD0F-ABD6D0B6F6BA>