From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Lepiller Subject: Re: Files not .gitignored when contributing to Guix Date: Fri, 17 Jan 2020 14:19:35 -0500 Message-ID: <7FB848B9-6DA1-4E62-8DDE-46D27D116FA6@lepiller.eu> References: <8736cdewqz.fsf@euandre.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:39007) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isX9q-0000sq-Uv for Help-Guix@gnu.org; Fri, 17 Jan 2020 14:19:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isX9p-00073r-Ls for Help-Guix@gnu.org; Fri, 17 Jan 2020 14:19:50 -0500 Received: from lepiller.eu ([2a00:5884:8208::1]:47272) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isX9p-00071B-1y for Help-Guix@gnu.org; Fri, 17 Jan 2020 14:19:49 -0500 In-Reply-To: <8736cdewqz.fsf@euandre.org> 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: EuAndreh , help-guix 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=2E 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 =2Epo files=2E I= f >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 =2Epo files contain mostly generated >translation strings and timestamps=2E > >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 >=2E/bootstrap >=2E/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 =2E=2E=2E" pour mettre =C3=A0 jour ce qui ser= a valid=C3=A9) >(utilisez "git restore =2E=2E=2E" pour annuler les modifications >dans le r=C3=A9pertoire de travail) > modifi=C3=A9=C2=A0: po/guix/cs=2Epo > modifi=C3=A9=C2=A0: po/guix/da=2Epo > modifi=C3=A9=C2=A0: po/guix/de=2Epo > modifi=C3=A9=C2=A0: po/guix/eo=2Epo > modifi=C3=A9=C2=A0: po/guix/es=2Epo > modifi=C3=A9=C2=A0: po/guix/fr=2Epo > modifi=C3=A9=C2=A0: po/guix/hu=2Epo > modifi=C3=A9=C2=A0: po/guix/pl=2Epo > modifi=C3=A9=C2=A0: po/guix/pt_BR=2Epo > modifi=C3=A9=C2=A0: po/guix/sr=2Epo > modifi=C3=A9=C2=A0: po/guix/sv=2Epo > modifi=C3=A9=C2=A0: po/guix/vi=2Epo > modifi=C3=A9=C2=A0: po/guix/zh_CN=2Epo > modifi=C3=A9=C2=A0: po/packages/da=2Epo > modifi=C3=A9=C2=A0: po/packages/de=2Epo > modifi=C3=A9=C2=A0: po/packages/eo=2Epo > modifi=C3=A9=C2=A0: po/packages/es=2Epo > modifi=C3=A9=C2=A0: po/packages/fr=2Epo > modifi=C3=A9=C2=A0: po/packages/hu=2Epo > modifi=C3=A9=C2=A0: po/packages/pl=2Epo > modifi=C3=A9=C2=A0: po/packages/pt_BR=2Epo > modifi=C3=A9=C2=A0: po/packages/sr=2Epo > modifi=C3=A9=C2=A0: po/packages/vi=2Epo > modifi=C3=A9=C2=A0: po/packages/zh_CN=2Epo > >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=2E > >Thanks :) >EuAndreh > >[0]: >https://lists=2Egnu=2Eorg/archive/html/guix-devel/2018-12/msg00387=2Ehtml You should do "git checkout po" after your first make=2E You won't be anno= yed by that anymore afterwards=2E