From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: .po files and git pull --rebase
Date: Wed, 05 Nov 2014 21:29:43 +0100
Message-ID: <874mud2xxk.fsf@gnu.org>
References: <CAKrPhPPV+oRk1xZx=F80tsQ8fLe22YxvJHr=Rdv9R7TDxx-k5g@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54235)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1Xm7DD-0004Pa-Qi
	for guix-devel@gnu.org; Wed, 05 Nov 2014 15:29:57 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1Xm7D8-0007eL-5v
	for guix-devel@gnu.org; Wed, 05 Nov 2014 15:29:51 -0500
Received: from hera.aquilenet.fr ([2a01:474::1]:48219)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1Xm7D7-0007eA-VW
	for guix-devel@gnu.org; Wed, 05 Nov 2014 15:29:46 -0500
In-Reply-To: <CAKrPhPPV+oRk1xZx=F80tsQ8fLe22YxvJHr=Rdv9R7TDxx-k5g@mail.gmail.com>
	(Federico Beffa's message of "Wed, 5 Nov 2014 18:34:59 +0100")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Federico Beffa <beffa@ieee.org>
Cc: Guix-devel <guix-devel@gnu.org>

Federico Beffa <beffa@ieee.org> skribis:

> Now, "git status" tells me that there are the following .po files
> which are modified and not staged:
>
> # On branch master
> # Changes not staged for commit:
> #   (use "git add <file>..." to update what will be committed)
> #   (use "git checkout -- <file>..." to discard changes in working direct=
ory)
> #
> #    modified:   po/guix/cs.po
> #    modified:   po/guix/de.po
> #    modified:   po/guix/eo.po
> #    modified:   po/guix/hu.po

Those files are updated typically when running =E2=80=98make dist=E2=80=99 =
(it=E2=80=99s really
just gettext adjusting the line numbers, adding new translatable
strings, etc.)

It=E2=80=99s safe to discard those changes, for instance with:

  git reset --hard

(Beware, this command discards all uncommitted changes!)

> Is it OK to tell git to ignore those files with:
>
> git update-index --assume-unchanged po/guix/cs.po

I=E2=80=99m not sure what it does but it sounds too low-level.

HTH,
Ludo=E2=80=99.