Date: Thu, 25 Feb 2021 10:30:15 +0100 From: Olivier Certner <olivier.freebsd@free.fr> To: Kevin Oberman <rkoberman@gmail.com> Cc: FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: How do I know if my 13-stable has security patches? Message-ID: <3308997.ajJYar8FF2@ravel> In-Reply-To: <CAN6yY1sehRjej7vf3B_TPsg%2BecpDLG=naQ2oiMZ=DATs3PUGzQ@mail.gmail.com> References: <CAN6yY1tTt%2BEn6hzMYrjm2fRkUPBAuN9t8%2BR27Z3To_sJRbfUVA@mail.gmail.com> <1748076.jFELhIj8lM@ravel> <CAN6yY1sehRjej7vf3B_TPsg%2BecpDLG=naQ2oiMZ=DATs3PUGzQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> Neither command is what I'd call 'intuitive', so it would have taken me a > long time to find either of them. I cut and pasted the 'git branch' command > and it took me a moment to realize what that meant. Never ran "grep -l" on > a pipe, I guess. You made me laugh! Apart from relatively simple commands, git's interface is far from intuitive. That's the reason why I regret that it became the hugely dominant DVCS. Sure, arguably most of the complexity comes from the DAG of commits, and the need to distinguish what is local and what is remote, which are not specific to git at all. But its interface makes things unnecessarily more complicated. It seems it grew up from ad-hoc pieces without much planification and it took a long time before it finally started to get more attention. A typical case were the cathedral would have been much better than the bazaar: Research for a minimal set of concepts required to have it work and model commands after it. Yes, it's not trivial and it takes time, but is usually much better in the end. But it's progressing somehow. Some time ago, 'git restore <file>' appeared, to replace the stance 'git checkout -- <file>'. It seems they are also trying to do something with new, hopefully more natural, commands, such as 'git switch' to switch branches. I guess this will benefit the next generations of us, since we have to deal with what's available and works in the meantime (and habits). ;-) And while I'm thinking about it: There is also 'git cherry' to check if some changes are in a branch. It doesn't match on the commit hashes but on the file contents. This is not necessary here because SAs specify the relevant commits per branches, but can be very useful to check that some changes were actually cherry-picked in another branch. -- Olivier Certner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3308997.ajJYar8FF2>