* Files not .gitignored when contributing to Guix
@ 2020-01-17 18:57 EuAndreh via
2020-01-17 19:19 ` Julien Lepiller
0 siblings, 1 reply; 5+ messages in thread
From: EuAndreh via @ 2020-01-17 18:57 UTC (permalink / raw)
To: help-guix
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=/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ées :
(utilisez "git add <fichier>..." pour mettre à jour ce qui sera validé)
(utilisez "git restore <fichier>..." pour annuler les modifications dans le répertoire de travail)
modifié : po/guix/cs.po
modifié : po/guix/da.po
modifié : po/guix/de.po
modifié : po/guix/eo.po
modifié : po/guix/es.po
modifié : po/guix/fr.po
modifié : po/guix/hu.po
modifié : po/guix/pl.po
modifié : po/guix/pt_BR.po
modifié : po/guix/sr.po
modifié : po/guix/sv.po
modifié : po/guix/vi.po
modifié : po/guix/zh_CN.po
modifié : po/packages/da.po
modifié : po/packages/de.po
modifié : po/packages/eo.po
modifié : po/packages/es.po
modifié : po/packages/fr.po
modifié : po/packages/hu.po
modifié : po/packages/pl.po
modifié : po/packages/pt_BR.po
modifié : po/packages/sr.po
modifié : po/packages/vi.po
modifié : po/packages/zh_CN.po
aucune modification n'a été ajoutée à 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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: Files not .gitignored when contributing to Guix
2020-01-17 18:57 Files not .gitignored when contributing to Guix EuAndreh via
@ 2020-01-17 19:19 ` Julien Lepiller
2020-01-19 7:06 ` Efraim Flashner
2020-01-21 0:05 ` EuAndreh via
0 siblings, 2 replies; 5+ messages in thread
From: Julien Lepiller @ 2020-01-17 19:19 UTC (permalink / raw)
To: EuAndreh, help-guix
Le 17 janvier 2020 13:57:56 GMT-05:00, EuAndreh via <help-guix@gnu.org> a écrit :
>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=/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ées :
>(utilisez "git add <fichier>..." pour mettre à jour ce qui sera validé)
>(utilisez "git restore <fichier>..." pour annuler les modifications
>dans le répertoire de travail)
> modifié : po/guix/cs.po
> modifié : po/guix/da.po
> modifié : po/guix/de.po
> modifié : po/guix/eo.po
> modifié : po/guix/es.po
> modifié : po/guix/fr.po
> modifié : po/guix/hu.po
> modifié : po/guix/pl.po
> modifié : po/guix/pt_BR.po
> modifié : po/guix/sr.po
> modifié : po/guix/sv.po
> modifié : po/guix/vi.po
> modifié : po/guix/zh_CN.po
> modifié : po/packages/da.po
> modifié : po/packages/de.po
> modifié : po/packages/eo.po
> modifié : po/packages/es.po
> modifié : po/packages/fr.po
> modifié : po/packages/hu.po
> modifié : po/packages/pl.po
> modifié : po/packages/pt_BR.po
> modifié : po/packages/sr.po
> modifié : po/packages/vi.po
> modifié : po/packages/zh_CN.po
>
>aucune modification n'a été ajoutée à 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
You should do "git checkout po" after your first make. You won't be annoyed by that anymore afterwards.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Files not .gitignored when contributing to Guix
2020-01-17 19:19 ` Julien Lepiller
@ 2020-01-19 7:06 ` Efraim Flashner
2020-01-21 0:12 ` EuAndreh via
2020-01-21 0:05 ` EuAndreh via
1 sibling, 1 reply; 5+ messages in thread
From: Efraim Flashner @ 2020-01-19 7:06 UTC (permalink / raw)
To: Julien Lepiller; +Cc: EuAndreh, help-guix
[-- Attachment #1: Type: text/plain, Size: 3808 bytes --]
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 <help-guix@gnu.org> a écrit :
> >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=/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ées :
> >(utilisez "git add <fichier>..." pour mettre à jour ce qui sera validé)
> >(utilisez "git restore <fichier>..." pour annuler les modifications
> >dans le répertoire de travail)
> > modifié : po/guix/cs.po
> > modifié : po/guix/da.po
> > modifié : po/guix/de.po
> > modifié : po/guix/eo.po
> > modifié : po/guix/es.po
> > modifié : po/guix/fr.po
> > modifié : po/guix/hu.po
> > modifié : po/guix/pl.po
> > modifié : po/guix/pt_BR.po
> > modifié : po/guix/sr.po
> > modifié : po/guix/sv.po
> > modifié : po/guix/vi.po
> > modifié : po/guix/zh_CN.po
> > modifié : po/packages/da.po
> > modifié : po/packages/de.po
> > modifié : po/packages/eo.po
> > modifié : po/packages/es.po
> > modifié : po/packages/fr.po
> > modifié : po/packages/hu.po
> > modifié : po/packages/pl.po
> > modifié : po/packages/pt_BR.po
> > modifié : po/packages/sr.po
> > modifié : po/packages/vi.po
> > modifié : po/packages/zh_CN.po
> >
> >aucune modification n'a été ajoutée à 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
>
> You should do "git checkout po" after your first make. You won't be annoyed by that anymore afterwards.
>
IIRC the reason for having it this way is if the .po files are added to
.gitignore then it messes with the guix snapshots and releases.
Unfortunately I don't remember more than that.
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Files not .gitignored when contributing to Guix
2020-01-17 19:19 ` Julien Lepiller
2020-01-19 7:06 ` Efraim Flashner
@ 2020-01-21 0:05 ` EuAndreh via
1 sibling, 0 replies; 5+ messages in thread
From: EuAndreh via @ 2020-01-21 0:05 UTC (permalink / raw)
To: Julien Lepiller, help-guix
Julien Lepiller <julien@lepiller.eu> writes:
> You should do "git checkout po" after your first make. You won't be annoyed by that anymore afterwards.
Thanks, I'm still familiarizing myself with the GNU Autotools workflow,
and I would do a full git clean every time I wanted to hack on Guix
source code, only realizing later that I shouldn't be running
./bootstrap and ./configure on every git pull.
This way the po/ files would get modified every time.
Thanks :)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-21 0:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-17 18:57 Files not .gitignored when contributing to Guix EuAndreh via
2020-01-17 19:19 ` Julien Lepiller
2020-01-19 7:06 ` Efraim Flashner
2020-01-21 0:12 ` EuAndreh via
2020-01-21 0:05 ` EuAndreh via
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.