Re: git pull fails

From: Timo Hirvonen <tihirvon@gmail.com>
Date: Mar 28, 2006, 14:38 UTC
Message-ID: <20060328173827.3d64d91e.tihirvon@gmail.com>
In-Reply-To: <20060328141140.GC3113@linux-mips.org>

Ralf Baechle <ralf@linux-mips.org> wrote:

Show 18 quoted lines

> Continuing to walk after breaking a leg isn't a good idea, but that's
> basically what your change did.  What has happened to you is the normal
> thing with branches that have been re-based or otherwise re-created.
> The better way to handle this kind of branches is to add a `+´ sign to
> the refspec for the pu branc in .git/remote/origin like:
> 
> [ralf@blah git]$ cat .git/remotes/origin
> URL: git://www.kernel.org/pub/scm/git/git.git
> Pull: master:master
> Pull: todo:todo
> Pull: +next:next
> Pull: maint:maint
> Pull: +pu:pu
> Pull: html:html
> Pull: man:man
> [ralf@blah git]$
> 
> The next branch is handled the same way, so another `+´ sign.

Thanks, but forcing everyone to edit their git/remotes/origin file is not very nice solution. I think git-fetch should update refs for the other non-'broken' branches and leave "pu" and "next" refs untouched.

-- 
http://onion.dynserv.net/~timo/