From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: Files not .gitignored when contributing to Guix Date: Sun, 19 Jan 2020 09:06:34 +0200 Message-ID: <20200119070634.GA1603@E5400> References: <8736cdewqz.fsf@euandre.org> <7FB848B9-6DA1-4E62-8DDE-46D27D116FA6@lepiller.eu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="BXVAT5kNtrzKuDFl" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:40152) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1it4gP-0001Ru-Dr for Help-Guix@gnu.org; Sun, 19 Jan 2020 02:07:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1it4gL-00043z-V1 for Help-Guix@gnu.org; Sun, 19 Jan 2020 02:07:41 -0500 Received: from flashner.co.il ([178.62.234.194]:33828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1it4gL-0003uL-Oh for Help-Guix@gnu.org; Sun, 19 Jan 2020 02:07:37 -0500 Content-Disposition: inline In-Reply-To: <7FB848B9-6DA1-4E62-8DDE-46D27D116FA6@lepiller.eu> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-guix-bounces+gcggh-help-guix=m.gmane-mx.org@gnu.org Sender: "Help-Guix" To: Julien Lepiller Cc: EuAndreh , help-guix --BXVAT5kNtrzKuDFl Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 17, 2020 at 02:19:35PM -0500, Julien Lepiller wrote: > Le 17 janvier 2020 13:57:56 GMT-05:00, EuAndreh via a= =C3=A9crit : > >Hi Guix! > > > >When running the setup steps to prepare a patch, I find myself with a > >dirty repository of changed files. Is this expected behaviour? > > > >I couldn't find guidance regarding that on the manual or the mailing > >list archives (only a similar issue[0]), and I wonder if is there a way > >to avoid it, or should I just get used to it? Is there something > >missing > >for things being this way that I didn't get yet? > > > >The output of make spits some warning regarding outdated .po files. If > >the dirty files are generated, should they even be commited in the > >repository if they are derived data? Looking at the diff, it confirms > >this hypothesis: the diff of the .po files contain mostly generated > >translation strings and timestamps. > > > >The setup steps I use are: > >--8<---------------cut here---------------start------------->8--- > >cd $GUIX_REPO > >git clean -ffdx > >guix environment guix --ad-hoc help2man git strace > >./bootstrap > >./configure --localstatedir=3D/var > >make > >--8<---------------cut here---------------end--------------->8--- > > > >At the end the dirty files are: > >--8<---------------cut here---------------start------------->8--- > >$ git status > >Sur la branche master > >Modifications qui ne seront pas valid=C3=A9es : > >(utilisez "git add ..." pour mettre =C3=A0 jour ce qui sera val= id=C3=A9) > >(utilisez "git restore ..." pour annuler les modifications > >dans le r=C3=A9pertoire de travail) > > modifi=C3=A9=C2=A0: po/guix/cs.po > > modifi=C3=A9=C2=A0: po/guix/da.po > > modifi=C3=A9=C2=A0: po/guix/de.po > > modifi=C3=A9=C2=A0: po/guix/eo.po > > modifi=C3=A9=C2=A0: po/guix/es.po > > modifi=C3=A9=C2=A0: po/guix/fr.po > > modifi=C3=A9=C2=A0: po/guix/hu.po > > modifi=C3=A9=C2=A0: po/guix/pl.po > > modifi=C3=A9=C2=A0: po/guix/pt_BR.po > > modifi=C3=A9=C2=A0: po/guix/sr.po > > modifi=C3=A9=C2=A0: po/guix/sv.po > > modifi=C3=A9=C2=A0: po/guix/vi.po > > modifi=C3=A9=C2=A0: po/guix/zh_CN.po > > modifi=C3=A9=C2=A0: po/packages/da.po > > modifi=C3=A9=C2=A0: po/packages/de.po > > modifi=C3=A9=C2=A0: po/packages/eo.po > > modifi=C3=A9=C2=A0: po/packages/es.po > > modifi=C3=A9=C2=A0: po/packages/fr.po > > modifi=C3=A9=C2=A0: po/packages/hu.po > > modifi=C3=A9=C2=A0: po/packages/pl.po > > modifi=C3=A9=C2=A0: po/packages/pt_BR.po > > modifi=C3=A9=C2=A0: po/packages/sr.po > > modifi=C3=A9=C2=A0: po/packages/vi.po > > modifi=C3=A9=C2=A0: po/packages/zh_CN.po > > > >aucune modification n'a =C3=A9t=C3=A9 ajout=C3=A9e =C3=A0 la validation = (utilisez "git add" > >ou "git commit -a") > >--8<---------------cut here---------------end--------------->8--- > > > >I'm looking to a better way to handle this situation (that I find a bit > >of a nuisance right now) or maybe just an explanation behind the way > >things currently are. > > > >Thanks :) > >EuAndreh > > > >[0]: > >https://lists.gnu.org/archive/html/guix-devel/2018-12/msg00387.html >=20 > You should do "git checkout po" after your first make. You won't be annoy= ed by that anymore afterwards. >=20 IIRC the reason for having it this way is if the .po files are added to =2Egitignore then it messes with the guix snapshots and releases. Unfortunately I don't remember more than that. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --BXVAT5kNtrzKuDFl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl4j//MACgkQQarn3Mo9 g1F5qg//UaNk3W/z/jxff9zH8t7jiLx50KEdTrpH+0L4PdkjjLBawTIQsxifAhL8 8fJwgPYO61Pl341EWl9N41W5/9RsAvvOCiJIVMrbw8vXZv7SLhKFyjMWGQKDlJaf op2VyRlOegNH/DnVs0PrCtoTI1a8xJjsc+5cTnhIx2Sl/Re0HiMnueeOYbzZ7rGC X8KhvJO2cpDQ1/g/OYhZS5HuxeoHYjQAky7y+MeRUO4TSCG5OkI6Lj/7yhOyF5+F Udoi1iVMSY7p5db9OGLFTnRqC4vgMMPTSjgxyXEXk/cnDInObdlu6jvJy4UEvD/o 4noXavVP0WLWej7RYcg8UC11j2BAht8qgYRT6FsCa8U7hnNcVXxEndsxLq+6WR8C ZbDWpjjS70GJG+UGGgJtlX1RtCa4mKP+9Om5z47v00gPPtqgzsrhSgUVt04xU6jp av52X2GVLVmxGtnyDYH5854jX7RCwm+8HS+R7w1StcMtUpna8oMUpaTKeka819vv aXrRA+BKx7CsV9uv4DP+PcYFvEvqnXpjQaBiJx7Ac/m8uD9hNgIGSTEjqq03XsOS Qq/xcMpOkICxjQOZ4ZQoQOmdonMVdgVTTg/B5ItHQVz1xVQmoK3hzOtrRVEqRXob P+I6Hxnd4iRvyEAAGKfoPf2Z9oH1JAVq/I6wNE5CL8hKhQf7cwo= =QlSg -----END PGP SIGNATURE----- --BXVAT5kNtrzKuDFl--