From owner-freebsd-current@freebsd.org Wed Apr 28 19:45:15 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 14E2E5FF374 for ; Wed, 28 Apr 2021 19:45:15 +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 4FVpy253cDz3JFB for ; Wed, 28 Apr 2021 19:45:14 +0000 (UTC) (envelope-from freebsd@grem.de) Received: by mailman.nyi.freebsd.org (Postfix) id AD94D5FF5B8; Wed, 28 Apr 2021 19:45:14 +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 AD59B5FF373 for ; Wed, 28 Apr 2021 19:45:14 +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 4FVpy171YMz3J5x; Wed, 28 Apr 2021 19:45:12 +0000 (UTC) (envelope-from freebsd@grem.de) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id 2aaf7047; Wed, 28 Apr 2021 19:45:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=grem.de; h=content-type :content-transfer-encoding:mime-version:subject:from:in-reply-to :date:cc:message-id:references:to; s=20180501; bh=fj65hxak54PFKs bL2L3pWfOytfM=; b=iRQuKNgLIjxxhRzgqCFsuoUpd4ppsBI+m6592+rGHewHqF GqkVDLievSkJ9Z2CUHKF2cs02siwdotMkeJW00GB/65Nu8b9au7PjaOUwm8egkAY bbyJUMGK3/IWFXL7YXYSLRnDhWHTo6ZPnqhAv5CzNoJ8luhPyFeKf1PywoZ7HLj3 x+X686LnHSLUFKV/838JSAHRjv96iSvJYb4K7J/uHzfSF/YKLLnDH/OeWMIXgS8J xesss+YxOll7j9gfyYsqWrANG/zAyH5oTlmYdJEXR2vZ7M0TA3UOD4XOLmkwwZ2O c2UqNrj3gPVaNRKRrYyUlxKYwC/1ZoteYli9EBAQ== DomainKey-Signature: a=rsa-sha1; c=nofws; d=grem.de; h=content-type :content-transfer-encoding:mime-version:subject:from:in-reply-to :date:cc:message-id:references:to; q=dns; s=20180501; b=NU9+fW0j E4HmO5o5ky74M1PqIih9ZRxoNiOnYP0RBlbavqe3KgKl029nuHi80fQ2BjEzW65B o/tQXaGEZ38jvOwmscAVY85jacxUz9JIMFqWAkkAM+TSVrINsWuzjLF1anVmCH74 Kw3znoblCiRoF17wlbdNkmoZCpm5G/fwE91yvz9XSBwSqOeRGCNQ8yl+yEc5XGvS vYXRy/GdWTOrLTmo9maT3LCuQPK2PR9u4O1661t65Xqg4WFaXiRGHchpp19EXZSL cGX7lRmv8riPI1zUcuBfqsCdQj5Pp6cevQVABcj28iC2tCbCJU1MvqMazBK9RRHa ayegCnzeH7SBlA== Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id 5d8166eb (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Wed, 28 Apr 2021 19:45:04 +0000 (UTC) Mime-Version: 1.0 (1.0) Subject: Re: git magic in contrib/bc From: Michael Gmelin In-Reply-To: <2b6e40a1-9aff-d587-ddb4-60157c46f404@freebsd.org> Date: Wed, 28 Apr 2021 21:45:03 +0200 Cc: Yuri Pankov , current@freebsd.org Message-Id: References: <2b6e40a1-9aff-d587-ddb4-60157c46f404@freebsd.org> To: Stefan Esser X-Mailer: iPhone Mail (18E199) X-Rspamd-Queue-Id: 4FVpy171YMz3J5x X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Wed, 28 Apr 2021 19:45:15 -0000 > 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 >>> 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 >> 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 > 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 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 d= irectory. It enables end-of-line conversion without any content checks, effe= ctively setting the text attribute. Note that setting this attribute on path= s which are in the index with CRLF line endings may make the paths to be con= sidered dirty. Adding the path to the index again will normalize the line en= dings in the index.=E2=80=9D Without completely understanding the problem, I would suggest to try the fol= lowing: rm .git/index git reset git commit -a git push (this should re-add the files to the index using the correct attributes) Best, Michael > 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 > Regards, STefan >=20