From nobody Wed Nov 10 02:26:19 2021 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D644A1838D9C for ; Wed, 10 Nov 2021 02:26:26 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from thebighonker.lerctr.org (thebighonker.lerctr.org [IPv6:2001:470:1f0f:3ad:7ae3:b5ff:fe1b:23b4]) (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 (2048 bits) client-digest SHA256) (Client CN "*.lerctr.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hppcy4Y16z3smw; Wed, 10 Nov 2021 02:26:26 +0000 (UTC) (envelope-from ler@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=ler2019; h=Content-Type:Message-ID:References:In-Reply-To:Subject:Cc:To: From:Date:MIME-Version:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=jjf0ILBlbey8xkEn8luONHaQeY42LP9H3WieEFL7Dho=; b=Lkco1c5y3SmYEX1r5Ga5+bnyGV O1aPXc7Jy8qhIjtjDcu1cu2b9QTIw/BqjYatixISJlI8Hbngun2kuKugEvPUHULuabFxUuQgS7hpY 9ocpN6E8gLIRaF4tmvbD1YxdHmu3YQFiNb6iX9v+OdJau6j40lc5mzqbQtt6DSamwiePxyrTXrPR5 fPgSIDBBCe194oAjTBS7cb5FRrxXJDBSGFNOaE7qsFqhkooV+j6GmOjsAPq8Oacnm3Z6GmHPkkKoA lUHlQ9VhVz745Z+1w0jdwJaGR8z74P9V88V3ujKhKtkXZIWR3PTmyrYUd9m69EcFMNYBOjq+heYVE Dv5K9xGw==; Received-SPF: softfail (thebighonker.lerctr.org: transitioning domain of FreeBSD.org does not designate 2001:470:1f0f:3ad:bb:dcff:fe50:d900 as permitted sender) client-ip=2001:470:1f0f:3ad:bb:dcff:fe50:d900; envelope-from=ler@FreeBSD.org; helo=webmail.lerctr.org; Received: from thebighonker.lerctr.org ([2001:470:1f0f:3ad:bb:dcff:fe50:d900]:19329 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1mkdJb-0005x5-Jn; Tue, 09 Nov 2021 20:26:19 -0600 Received: from 2600:1700:210:b18f:3480:4bdc:93bc:e65f by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Tue, 09 Nov 2021 20:26:19 -0600 List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Date: Tue, 09 Nov 2021 20:26:19 -0600 From: Larry Rosenman To: Philip Paeps Cc: doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org Subject: Re: git: 6952540fe7 - main - really update the expire date. In-Reply-To: <889D20FD-081C-48C4-BD0F-ABD6D0B6F6BA@freebsd.org> References: <202111090433.1A94XaUt022831@gitrepo.freebsd.org> <94C734B9-BD9E-4C08-9683-4CFDD5A0D100@freebsd.org> <371e31b54f70b85dc733a4059d6d3e9c@FreeBSD.org> <0da0dc3c9002ffc3fe4f4cc71d260f80@FreeBSD.org> <889D20FD-081C-48C4-BD0F-ABD6D0B6F6BA@freebsd.org> Message-ID: <277409d4c417f4701a543377b3c336d3@FreeBSD.org> X-Sender: ler@FreeBSD.org Content-Type: multipart/alternative; boundary="=_055a4880788f0d952dd24f164ac10d53" X-Rspamd-Queue-Id: 4Hppcy4Y16z3smw X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --=_055a4880788f0d952dd24f164ac10d53 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 11/09/2021 8:21 pm, Philip Paeps wrote: > 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 Thanks! I did some reading and came to the same conclusion, and a git diff HEAD~1 HEAD before I pull more tells lot more. I'd suggest that this tip make it into a doc for the next committer. -- Larry Rosenman http://people.freebsd.org/~ler Phone: +1 214-642-9640 E-Mail: ler@FreeBSD.org US Mail: 5708 Sabbia Dr, Round Rock, TX 78665-2106 --=_055a4880788f0d952dd24f164ac10d53--