[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: savannah git stale?

From: Jim Meyering
Subject: Re: savannah git stale?
Date: Tue, 02 Jun 2009 10:23:51 +0200

Simon Josefsson wrote:
> Gnulib git on savannah seems stale, which is consistent with the post to
> savannah-announce, but how should we resolve it?
> I attempted to push the changes I had locally (which correspond to
> everything up until maybe a day before the crash) but it failed:
> address@hidden:~/src/gnulib master$ git pull
>>From address@hidden:/srv/git/gnulib
>  + 2b08e89...f56ff6b master     -> origin/master  (forced update)
> Already up-to-date.
> address@hidden:~/src/gnulib master$ git pull
> Already up-to-date.
> address@hidden:~/src/gnulib master$ git push --all
> Counting objects: 583, done.
> Delta compression using up to 2 threads.
> Compressing objects: 100% (263/263), done.
> Writing objects: 100% (471/471), 195.02 KiB, done.
> Total 471 (delta 337), reused 319 (delta 208)
> build-aux/texinfo.tex:2: trailing whitespace.

This is the sticking point.

> error: hooks/update exited with error code 2
> error: hook declined to update refs/heads/master
> To address@hidden:/srv/git/gnulib.git
>  ! [remote rejected] master -> master (hook declined)
> error: failed to push some refs to 'address@hidden:/srv/git/gnulib.git'
> address@hidden:~/src/gnulib master$
> For reference, on my build host, the latest commit is:
> commit 6fd2df816bfd58804024dbfd8fa0f22e60dbb140
> Author: Bruno Haible <address@hidden>
> Date:   Thu May 28 13:09:26 2009 +0200
>     Don't do HAVE_CONFIG_H replacements on build-aux/ files.
> That should correspond to what's on savannah at most ~2 hours before the
> savannah crash.

At Karl's request, I reluctantly relaxed the server-side hook that
prohibits pushing changes containing added trailing blanks by doing
this in savannah's cvs "vserver":

  echo build-aux/texinfo.tex -whitespace > /srv/git/gnulib.git/info/attributes

I did that a week or two ago.
However, that change has not yet been restored since we were
using a snapshot of the repository from April 29.

Anyhow, I've just redone that and pushed, so now
gnulib's repository is back up to date again.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]