Date: Thu, 29 Apr 2021 20:07:40 +0200 From: Michael Gmelin <grembo@freebsd.org> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Michael Gmelin <grembo@freebsd.org>, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: a0358e3d5184 - main - Synch index of contrib/bc with what is in workdir after cloning. Message-ID: <20210429200740.5e8bfe5a@bsd64.grem.de> In-Reply-To: <202104291730.13THUOv6006096@slippy.cwsent.com> References: <202104291234.13TCYk5K092776@gitrepo.freebsd.org> <202104291353.13TDrIg3026309@slippy.cwsent.com> <20210429162959.16662d66@bsd64.grem.de> <202104291455.13TEtxEg040285@slippy.cwsent.com> <20210429172122.1751663f@bsd64.grem.de> <202104291730.13THUOv6006096@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 29 Apr 2021 10:30:24 -0700 Cy Schubert <Cy.Schubert@cschubert.com> wrote: > Going back in time through each daily snapshot, my April 26 0230U > snapshot first exhibited the problem. Yes, like I wrote, the problem was introduced in 8ea9013512 (which was on April 26th). If you take your snapshot from - let's say - April 27th, you can also easily demonstrate the problem by doing: cp -a /usr/src /usr/srccopy cd /usr/src/srccopy git status Or by doing: cd /usr/src rm .git/index git reset git status or by doing: cd /usr/src touch contrib/bc/*vcx* git status > > My remediation efforts are below: > >> ... > slippy$ > > > There is no way to move forward except to rm (not git rm but UNIX rm) > the files. Checkout another branch and blow away the affected branch. > With the files physically deleted with rm(1) I could switch branches > and blow away the affected branch. Without this extreme I can't even > switch branches. AFAIK there are two options forward: 1. Simply add the files that are shown as changed on your local branch (that's all my commit did, "git commit -a"). 2. Temporarily do: echo "contrib/bc/bc*.vcx* -text" >>.git/info/attributes > > Lucky for me this branch was a placeholder maintaining a record of > what was installed on my laptop vs main, so it's easy to blow away > and recreate. But for people with committed changes to a branch this > would be a huge problem. The two things above should work. > > My other branches which I rebase much less frequently were unaffected. > > AFAIK this only affects branches which happen to contain changes since 8ea9013512. If not, I'm afraid some breaking repo-surgery would be required, going back before 8ea9013512 (just doing a revert patch won't accomplish anything different). -m -- Michael Gmelin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210429200740.5e8bfe5a>