Re: [Bug-zile] gnulib updates

[Gary V. Vaughan]

Hi Reuben,

On 9 Jan 2012, at 04:47, Reuben Thomas <address@hidden> wrote:
> Whenever I move between computers working on Zile, gnulib seems to be
> in a state where it's updated, so I end up committing endless
> pseudo-updates to gnulib just so I don't commit it by mistake with git
> ci -a. This is despite my starting with a git pull to get the local
> repo up to date.
> 
> Am I doing something wrong?

Yes: gnulib in the zile repo is a git submodule, so running bootstrap after
git fetch/merge/update will make sure that the revision of that gnulib
submodule checked out in the working tree matches the revision recorded
in the repo by the last gnulib update commit.

I can't remember offhand precisely what the git incantation used is, but it
should be easy to find by reading through bootstrap itself if you are curious.

One caveat is that I have found git sometimes gets confused about the
gnulib revision (perhaps when I have checked in from two machines
before merging or something), in which case I tend to do something like
this (from memory!):

  $ git clean -dfx
  $ rm -rf gnulib
  $ cd ../gnulib
  $ git pull
  $ cd -
  $ git pull
  $ ./bootstrap --gnulib-srcdir=../gnulib

At which point bootstrap always manages to checkout the revision of the
gnulib submodule that matches the one last checked in to the zile repo.

HTH,
-- 
Gary V. Vaughan (gary AT gnu DOT org)