From owner-freebsd-current@freebsd.org Thu Apr 29 12:56:03 2021 Return-Path: Delivered-To: freebsd-current@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 20BB0626EE0 for ; Thu, 29 Apr 2021 12:56:03 +0000 (UTC) (envelope-from freebsd@grem.de) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FWFqQ693cz4d9K for ; Thu, 29 Apr 2021 12:56:02 +0000 (UTC) (envelope-from freebsd@grem.de) Received: by mailman.nyi.freebsd.org (Postfix) id D391462737A; Thu, 29 Apr 2021 12:56:02 +0000 (UTC) Delivered-To: current@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 D35AE627148 for ; Thu, 29 Apr 2021 12:56:02 +0000 (UTC) (envelope-from freebsd@grem.de) 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 4FWFqP67Xcz4dJt; Thu, 29 Apr 2021 12:56:01 +0000 (UTC) (envelope-from freebsd@grem.de) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id 88814fc9; Thu, 29 Apr 2021 12:55:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=grem.de; h=date:from:to:cc :subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180501; bh=r+Vk02mm QaS+2KlrZTsRXOqSJQQ=; b=aJvT4RX5GBwEbgUHsN8kRcyQW+3tw6MD1jHdDrom GDFCikyXThxn8KgUYHbGU4zQsde6Y9rPSYsHPdFCg7DyZUCSti6BKpqwxD2N7rCh Za08OSdOpJ/ubNCb/JZBPyRQnMyaY4nkZrbX7JHU7EPSj8ZTcAkx5j5ozkwKTnrZ 2fuaw87nSH0i5zjresQZnBDPGkMfDaWmPgS+mxHfedWGw8Bp0utnrz8ybJ/Y3n51 E3jzl7kO/CvcZDo9n/c/uzWcHjuL4u4IhTmRqcWCBTPg1qdxGH+paZ+EjPcmhc3r 6+jKKMv6h8/JCTghIYL1F4/mCFVEFb7zIjQJ7CLjzAjaHA== DomainKey-Signature: a=rsa-sha1; c=nofws; d=grem.de; h=date:from:to:cc :subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=20180501; b=ka FZqV9azZXhLDKp15LlIBdz+U2QAjzmaPXwoCbTb1EfW9IdZHy4983NcMfUyDo3yI hD3YTZHRk9k4EF1Qw2dg00G9mubUF4KokdJjM9ad+tCWM4f+l2AvxLKU9U//7V8D J2eJOMv/4A6dYtxJs8HqhxHIGnge0nHjn8MAtL7UzP5k5G7sQHQ43zZThbzxD2bG qcn+TUnJs59NYAvOOUe3x3o6A5s1bIyVw+nRO/o84L4K1ctIZK+bSLW9adKPgO+2 YVNWhRvtnNGVp4FiOq5aBDh0+OBAVf1CFJkOhFD95qdSOd7dHmZuJ5c+5NKUX/Xl kBEiO2Nskwx6R/caEuuQ== Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id b69d3dc9 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Thu, 29 Apr 2021 12:55:58 +0000 (UTC) Date: Thu, 29 Apr 2021 14:55:39 +0200 From: Michael Gmelin To: Stefan Esser Cc: Yuri Pankov , current@freebsd.org Subject: Re: git magic in contrib/bc Message-ID: <20210429145539.73cc2fcb@bsd64.grem.de> In-Reply-To: References: <2b6e40a1-9aff-d587-ddb4-60157c46f404@freebsd.org> 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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4FWFqP67Xcz4dJt X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=grem.de header.s=20180501 header.b=aJvT4RX5; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd@grem.de designates 213.239.217.29 as permitted sender) smtp.mailfrom=freebsd@grem.de X-Spamd-Result: default: False [-3.50 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[grem.de:s=20180501]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:213.239.217.29/32]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[grem.de]; NEURAL_HAM_LONG(-1.00)[-1.000]; SPAMHAUS_ZRD(0.00)[213.239.217.29:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[grem.de:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[213.239.217.29:from]; ASN(0.00)[asn:24940, ipnet:213.239.192.0/18, country:DE]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[current]; FREEMAIL_CC(0.00)[ftml.net,freebsd.org] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2021 12:56:03 -0000 On Wed, 28 Apr 2021 21:45:03 +0200 Michael Gmelin wrote: > > On 28. Apr 2021, at 21:37, Stefan Esser wrote: > >=20 > > =EF=BB=BFAm 28.04.21 um 20:44 schrieb Michael Gmelin: =20 > >>=20 > >> =20 > >>> On Wed, 28 Apr 2021 20:00:38 +0300 > >>> Yuri Pankov wrote: > >>>=20 > >>> Not sure if it's just me, but I'm seeing a bit of git weirdness in > >>> contrib/bc: =20 > >>=20 > >> I'm seeing the same here, also when doing: > >>=20 > >> rm .git/index > >> git reset > >> git status > >>=20 > >> after this, `git diff' also shows what changed in those files > >> (basically every line). It's all whitespace characters, as `git > >> diff -w' is empty. > >>=20 > >> Turns out EOLs changed, I suspect this is due to the eol overrides > >> in contrib/bc/.gitattributes. If I comment those out, "git diff" > >> is silent again. =20 > >=20 > > Yes, the new file .gitattributes has recently been committed by me > > as part of an upgrade. > >=20 > > I do assume that the files affected are only for the Windows build > > that has been added in version 4.0.0. > >=20 > > I do not know how to fix this problem (and whether this is just a > > nuisance or an actual problem). > > =20 >=20 > https://git-scm.com/docs/gitattributes says: > =E2=80=9C eol > This attribute sets a specific line-ending style to be used in the > working directory. It enables end-of-line conversion without any > content checks, effectively setting the text attribute. Note that > setting this attribute on paths which are in the index with CRLF line > endings may make the paths to be considered dirty. Adding the path to > the index again will normalize the line endings in the index.=E2=80=9D >=20 > Without completely understanding the problem, I would suggest to try > the following: >=20 > rm .git/index > git reset > git commit -a > git push >=20 It is enough to touch contrib/bc/* to trigger the same behavior: Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: bc.vcxproj modified: bc.vcxproj.filters modified: bcl.vcxproj modified: bcl.vcxproj.filters > (this should re-add the files to the index using the correct > attributes) >=20 > Best, > Michael >=20 > > The upstream repository is https://git.yzena.com/gavin/bc and I have > > performed a "diff -r" of the distfile of the math/gh-bc port against > > the files in vendor/bc in our repository (before the commit to that > > repository) and thus any change that we locally apply will need to > > be upstreamed. > >=20 These files won't differ from what is checked into our repo - the problem seems only to be with the index, due to the order in which they were checked in. I simply recommitted[0] what is in the workdir after touching the files (the new modification time made "git status" consider them, they were always different after checkout than what's in .git/index). This fixes the issue we perceived (checkout, copy, touch etc. won't show the paths to be dirty anymore), while the diff to gavin/bc stays clean: $ diff -r contrib/bc ~/gavin/bc Only in /home/user/gavin/bc: .git I think this is the correct way to address the problem (having it around was definitely more than a nuisance, as it would pop up as a change every time the index is refreshed). Cheers, Michael [0]https://cgit.freebsd.org/src/commit/?id=3Da0358e3d5184950b4316f105eb292c= bafdea208b --=20 Michael Gmelin