Date: Fri, 27 Jan 2023 13:03:40 -0700 From: Warner Losh <imp@bsdimp.com> To: Ed Maste <emaste@freebsd.org> Cc: "Bjoern A. Zeeb" <bz@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org Subject: Re: git: 247e03ed8b83 - main - Add git-blame ignore file Message-ID: <CANCZdfpq73F_TYYk6QWAh=kHFv0kXL_N08Ngj0uMV0HBOk5fhg@mail.gmail.com> In-Reply-To: <CAPyFy2Dt%2Bw5nwyeGvkgqc7xi3SONiyetbe6f4-RCiJ61rsX=9A@mail.gmail.com> References: <202301232027.30NKRckV060051@gitrepo.freebsd.org> <1o40rq5-n1pr-ss27-q14-qo845q26398@mnoonqbm.arg> <CAPyFy2Dt%2Bw5nwyeGvkgqc7xi3SONiyetbe6f4-RCiJ61rsX=9A@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Fri, Jan 27, 2023, 12:59 PM Ed Maste <emaste@freebsd.org> wrote: > On Fri, 27 Jan 2023 at 10:24, Bjoern A. Zeeb <bz@freebsd.org> wrote: > > > > On Mon, 23 Jan 2023, Ed Maste wrote: > > > > > The branch main has been updated by emaste: > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=247e03ed8b8341cf25dc3d9ecb846612d984f424 > > > > > > commit 247e03ed8b8341cf25dc3d9ecb846612d984f424 > > > Author: Ed Maste <emaste@FreeBSD.org> > > > AuthorDate: 2023-01-23 20:27:25 +0000 > > > Commit: Ed Maste <emaste@FreeBSD.org> > > > CommitDate: 2023-01-23 20:27:25 +0000 > > > > > > Add git-blame ignore file > > > > > > .git-blame-ignore-revs lists commit hashes that should be skipped by > > > `git blame` e.g. non-functional whitespace or style cleanup. > > > > > > The file is populated with a few sample entries. > > > > How is this file to be used? > > > > 1. Do a non-functional commit? > > 2. And then do another commit to add the hash? > > Yes, although there's no need to list every non-functional change > here. It's useful mainly for changes that would otherwise obscure the > history/blame - for example, re-indenting libexec/rtld-elf/rtld.c to > use standard indentation would be a good use. > > We could omit the comments, but I don't think it's worth the effort to > try to automate this. > Yea, we need a hash to put in the file which suggests that at most we could do automatically is add a new commit at the end of the push... and that's going to cause extra friction if we do it too much. And if we do it rarely, there's little benefit to automation. And reformatting is very rare.... Warner > [-- Attachment #2 --] <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jan 27, 2023, 12:59 PM Ed Maste <<a href="mailto:emaste@freebsd.org">emaste@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Fri, 27 Jan 2023 at 10:24, Bjoern A. Zeeb <<a href="mailto:bz@freebsd.org" target="_blank" rel="noreferrer">bz@freebsd.org</a>> wrote:<br> ><br> > On Mon, 23 Jan 2023, Ed Maste wrote:<br> ><br> > > The branch main has been updated by emaste:<br> > ><br> > > URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=247e03ed8b8341cf25dc3d9ecb846612d984f424" rel="noreferrer noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=247e03ed8b8341cf25dc3d9ecb846612d984f424</a><br>; > ><br> > > commit 247e03ed8b8341cf25dc3d9ecb846612d984f424<br> > > Author: Ed Maste <emaste@FreeBSD.org><br> > > AuthorDate: 2023-01-23 20:27:25 +0000<br> > > Commit: Ed Maste <emaste@FreeBSD.org><br> > > CommitDate: 2023-01-23 20:27:25 +0000<br> > ><br> > > Add git-blame ignore file<br> > ><br> > > .git-blame-ignore-revs lists commit hashes that should be skipped by<br> > > `git blame` e.g. non-functional whitespace or style cleanup.<br> > ><br> > > The file is populated with a few sample entries.<br> ><br> > How is this file to be used?<br> ><br> > 1. Do a non-functional commit?<br> > 2. And then do another commit to add the hash?<br> <br> Yes, although there's no need to list every non-functional change<br> here. It's useful mainly for changes that would otherwise obscure the<br> history/blame - for example, re-indenting libexec/rtld-elf/rtld.c to<br> use standard indentation would be a good use.<br> <br> We could omit the comments, but I don't think it's worth the effort to<br> try to automate this.<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Yea, we need a hash to put in the file which suggests that at most we could do automatically is add a new commit at the end of the push... and that's going to cause extra friction if we do it too much. And if we do it rarely, there's little benefit to automation. And reformatting is very rare....</div><div dir="auto"><br></div><div dir="auto">Warner</div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> </blockquote></div></div></div>help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpq73F_TYYk6QWAh=kHFv0kXL_N08Ngj0uMV0HBOk5fhg>