From owner-dev-commits-src-all@freebsd.org Thu Apr 29 16:45:35 2021 Return-Path: <owner-dev-commits-src-all@freebsd.org> Delivered-To: dev-commits-src-all@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 22DF7630645; Thu, 29 Apr 2021 16:45:35 +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 4FWLwG429Yz4rGy; Thu, 29 Apr 2021 16:45:34 +0000 (UTC) (envelope-from grembo@freebsd.org) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id 87333b86; Thu, 29 Apr 2021 16:45:30 +0000 (UTC) Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id d0e44cfc (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Thu, 29 Apr 2021 16:45:23 +0000 (UTC) Date: Thu, 29 Apr 2021 18:45:03 +0200 From: Michael Gmelin <grembo@freebsd.org> To: Konstantin Belousov <kostikbel@gmail.com> Cc: Michael Gmelin <grembo@freebsd.org>, Cy Schubert <Cy.Schubert@cschubert.com>, 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: <20210429184503.06701da5@bsd64.grem.de> In-Reply-To: <YIrdPtWlpm3iqeUQ@kib.kiev.ua> 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> <YIrdPtWlpm3iqeUQ@kib.kiev.ua> 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: 4FWLwG429Yz4rGy X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>, <mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>, <mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 29 Apr 2021 16:45:35 -0000 On Thu, 29 Apr 2021 19:22:22 +0300 Konstantin Belousov <kostikbel@gmail.com> wrote: > On Thu, Apr 29, 2021 at 05:21:22PM +0200, Michael Gmelin wrote: > > > > > ... > > So I have the same, on the very living branch I rebased yesterday. > Today I cannot: > > solo% git status > ~/work/DEV/src On branch pt_coredump > Changes not staged for commit: > (use "git add <file>..." to update what will be committed) > (use "git restore <file>..." to discard changes in working > directory) modified: contrib/bc/bc.vcxproj > modified: contrib/bc/bc.vcxproj.filters > modified: contrib/bc/bcl.vcxproj > modified: contrib/bc/bcl.vcxproj.filters > > Untracked files: > (use "git add <file>..." to include in what will be committed) > sys/amd64/compile/ > > no changes added to commit (use "git add" and/or "git commit -a") > solo% git checkout . > ~/work/DEV/src Updated 4 paths from the index > solo% git status > ~/work/DEV/src On branch pt_coredump > Changes not staged for commit: > (use "git add <file>..." to update what will be committed) > (use "git restore <file>..." to discard changes in working > directory) modified: contrib/bc/bc.vcxproj > modified: contrib/bc/bc.vcxproj.filters > modified: contrib/bc/bcl.vcxproj > modified: contrib/bc/bcl.vcxproj.filters > > Untracked files: > (use "git add <file>..." to include in what will be committed) > sys/amd64/compile/ > > no changes added to commit (use "git add" and/or "git commit -a") > > Whatever brokeness in repo we had before, it did not prevented other > people to work with it. Now I cannot even rebase. It would have in the future, as the problem is caused by switching between branches. The moment any of those files changes, we would see the same problem re-appear. Anytime re-indexing happens you would see the problem re-appear. Sooner or later somebody would then commit those files as part of another commit by accident and we are in the same situation again. > > Requiring all developers to add some attributes to all clones just > moves the brokeness into wrong direction. I'm happy to see a better solution applied, I don't know if there is any that won't break rebasing for commits that happened (and that doesn't involve going back to the offending commit and changing history/hashes). Even just removing the files from contrib/bc would cause these issues when switching between branches/rebasing at this point. Essentially, anything that involves commits since 8ea9013512 is somehow affected. IMHO the shorter we keep this period, the better, but again, if you have a better idea, do whatever is necessary. -m -- Michael Gmelin