From owner-dev-commits-src-main@freebsd.org Thu Apr 29 18:08:06 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8A17B63256C; Thu, 29 Apr 2021 18:08:06 +0000 (UTC) (envelope-from grembo@freebsd.org) Received: from mail.evolve.de (mail.evolve.de [213.239.217.29]) (using TLSv1.3 with cipher TLS_CHACHA20_POLY1305_SHA256 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.evolve.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FWNlT5prsz4tr3; Thu, 29 Apr 2021 18:08:05 +0000 (UTC) (envelope-from grembo@freebsd.org) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id 56110534; Thu, 29 Apr 2021 18:08:03 +0000 (UTC) Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id d6d11e6e (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Thu, 29 Apr 2021 18:08:00 +0000 (UTC) Date: Thu, 29 Apr 2021 20:07:40 +0200 From: Michael Gmelin To: Cy Schubert Cc: Michael Gmelin , 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> X-Face: $wrgCtfdVw_H9WAY?S&9+/F"!41z'L$uo*WzT8miX?kZ~W~Lr5W7v?j0Sde\mwB&/ypo^}> +a'4xMc^^KroE~+v^&^#[B">soBo1y6(TW6#UZiC]o>C6`ej+i Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWJBwe5BQDl LASZU0/LTEWEfHbyj0Txi32+sKrp1Mv944X8/fm1rS+cAAAACXBIWXMAAAsTAAAL EwEAmpwYAAAAB3RJTUUH3wESCxwC7OBhbgAAACFpVFh0Q29tbWVudAAAAAAAQ3Jl YXRlZCB3aXRoIFRoZSBHSU1QbbCXAAAAAghJREFUOMu11DFvEzEUAGCfEhBVFzuq AKkLd0O6VrIQsLXVSZXoWE5N1K3DobBBA9fQpRWc8OkWouaIjedWKiyREOKs+3PY fvalCNjgLVHeF7/3bMtBzV8C/VsQ8tecEgCcDgrzjekwKZ7TwsJZd/ywEKwwP+ZM 8P3drTsAwWn2mpWuDDuYiK1bFs6De0KUUFw0tWxm+D4AIhuuvZqtyWYeO7jQ4Aea 7jUqI+ixhQoHex4WshEvSXdood7stlv4oSuFOC4tqGcr0NjEqXgV4mMJO38nld4+ xKNxRDon7khyKVqY7YR4d+Cg0OMrkWXZOM7YDkEfKiilCn1qYv4mighZiynuHHOA Wq9QJq+BIES7lMFUtcikMnkDGHUoncA+uHgrP0ctIEqfwLHzeSo+eUA66AqzwN6n 2ZHJhw6Qh/PoyC/QENyEyC/AyNjq74Bs+3UH0xYwzDUC4B97HgLocg1QLYgDDO1v f3UX9Y307Ew4AHh67YAFFsxEpkXwpXY3eIgMhAAE3R19L919nNnuD2wlPcDE3UeT L2ytEICQib9BXgS2fU8PrD82ToYO1OEmMSnYTjSqSv9wdC0tPYC+rQRQD9ESnldF CyqfmiYW+tlALt8gH2xrMdC/youbjzPXEun+/ReXsMCDyve3dZc09fn2Oas8oXGc Jj6/fOeK5UmSMPmf/jL+GD8BEj0k/Fn6IO4AAAAASUVORK5CYII= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FWNlT5prsz4tr3 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:24940, ipnet:213.239.192.0/18, country:DE] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2021 18:08:06 -0000 On Thu, 29 Apr 2021 10:30:24 -0700 Cy Schubert 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