Date: Tue, 12 Jan 2021 12:47:44 -0800 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Joseph Mingrone <jrm@FreeBSD.org> Cc: Cy Schubert <Cy.Schubert@cschubert.com>, Cy Schubert <cy@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r561259 - head/security/sudo Message-ID: <202101122047.10CKliIt003213@slippy.cwsent.com> In-Reply-To: <861reqkl4b.fsf@phe.ftfl.ca> References: <202101112006.10BK6TnQ052930@repo.freebsd.org> <202101112016.10BKGEjJ037336@slippy.cwsent.com> <202101112059.10BKxfb8039825@slippy.cwsent.com> <861reqkl4b.fsf@phe.ftfl.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <861reqkl4b.fsf@phe.ftfl.ca>, Joseph Mingrone writes: > --=-=-= > Content-Type: text/plain > Content-Transfer-Encoding: quoted-printable > > On Mon, 2021-01-11 at 12:59, Cy Schubert <Cy.Schubert@cschubert.com> wrote: > > > In message <202101112016.10BKGEjJ037336@slippy.cwsent.com>, Cy Schubert=20 > > writes: > >> In message <202101112006.10BK6TnQ052930@repo.freebsd.org>, Cy Schubert=20 > >> writes: > >> > Author: cy > >> > Date: Mon Jan 11 20:06:29 2021 > >> > New Revision: 561259 > >> > URL: https://svnweb.freebsd.org/changeset/ports/561259 > > >> > Log: > >> > Update 1.9.4p2 --> 1.9.5 > > >> > PR: 252583 > >> > Submitted by: cy > >> > Reported by: cy > >> > Approved by: garga (maintainer) > >> > MFH: 2021Q1 > >> > Security: CVE-2021-23239 > > >> Looks like a hash mismatch in git-svn has caused my vuxml update not to = > be=20 > >> committed. I'll need to do that commit over again later. > > > .gitauthors was the culprit. It may have been updated after nc@ made his= > =20 > > first commit. This caused git-svn a bit of gas. > > The .gitauthors files was updated on the 4th and nc@ first committed on > the 9th. What I am guessing happened is that your previous `git svn > rebase` was before each of these commits. It's a problem that I > discussed on git@freenode a few times. You need an updated .gitauthors > before doing `git svn rebase`, but need a `git svn rebase` to get the > new .gitauthors file. One workaround is to manually edit and commit > .gitauthors to match the latest version, then do the `git svn rebase` > again. Another workaround is to temporarily remove reference to the > authors file from your git configuration. > > I'm told the ports tree will transition to git after 2021Q1 (someone > please correct me if I'm wrong), so this problem will go away soon. > > Joe I managed to work around it by pointing to a .gitauthors file in a svn checkout I have here, after doing svn up in it first. But it did stop the second commit that was "cached" dead in its tracks. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101122047.10CKliIt003213>