Re: [bug in next ?] git-fetch/git-push issue
On Mon, Nov 05, 2007 at 05:56:54PM +0000, Pierre Habouzit wrote:
Show 24 quoted lines
> With the current tip of next[0], I have this bizare issue:
>
> * I have two branches say master, and next, I'm on next.
>
> * my master lags behind origin/master, but next is a fast-forward wrt
> origin/next.
>
> Now I git push:
>
> ┌─(18:16)──<~/some/repo next>──
> └[artemis] git push
> error: remote 'refs/heads/master' is not an ancestor of
> local 'refs/heads/master'.
> Maybe you are not up-to-date and need to pull first?
> updating 'refs/heads/next'
> from xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
> to yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
> Counting objects: 24, done.
> Compressing objects: 100% (14/14), done.
> Writing objects: 100% (14/14), done.
> Total 14 (delta 12), reused 0 (delta 0)
> refs/heads/next: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -> yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
> updating local tracking ref 'refs/remotes/origin/master'
> updating local tracking ref 'refs/remotes/origin/next'
> I believe there is something rotten in the kingdom of Denmark… though
> my heads seems to always be OK, I think it's just an output issue.
Okay I'm wrong. it happened again, in fact after the git-push I don't
have a origin/master anymore.
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
Pierre Habouzit <madcoder@debian.org>