Re: git pull origin doesn't update the master

From: sean <seanlkml@sympatico.ca>
Date: Apr 10, 2006, 05:03 UTC
Message-ID: <BAYC1-PASMTP11D3D1D967525A6F029F85AECC0@CEZ.ICE>
In-Reply-To: <cc723f590604092141q3517136cmc0a895a069021b8f@mail.gmail.com>

On Mon, 10 Apr 2006 10:11:05 +0530 "Aneesh Kumar" <aneesh.kumar@gmail.com> wrote:

Show 13 quoted lines

> While updating the git code base the master branch is not getting
> updated. First look tell me that the below commit is the issue
> a9698bb22fb7b66e5882c3a5e7b2b8b53ea03f90
> 
> git-pull.sh does
> git-fetch --update-head-ok "$@" || exit 1
> 
> and git-fetch.sh exit with status 1 printing the below message
> 
> * refs/heads/pu: does not fast forward to branch 'pu' of
> http://git.kernel.org/pub/scm/git/git;
>   not updating.
>

The "pu" branch often won't fast forward because some commits have been completely deleted in it since the last time you pulled.

If you want to track it, add a plus (+) sign to the proper line in your .git/remotes/origin file, like this:

Pull: +refs/heads/pu:refs/heads/pu

Which tells git to deal with the problem for you by merging instead of fast forwarding. Or you can just delete that line completely if you don't want to track the pu branch at all.

HTH, Sean