Re: I broke git again

[Han-Wen Nienhuys]

Graham Percival escreveu:
> This was completely unintentional, please revert.
> http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=commit;h=3cac541f96771eb56fc4063df3d9a9ac765bc551

I think this is nothing to worry about. Gitweb shows a bogus patch
when you're merging branches: It shows the diff of what happened in
the other branch, in this case a couple of bugfixes by Jan and me.
This has been fixed in recent revisions of Gitweb, IIRC.


> At about 3pm, I tried a git push (to upload that fix)
> tsubasa:~/usr/src/lilypond gperciva$ git push
> ssh+git://address@hidden/srv/git/lilypond.git/
> error: remote 'refs/heads/master' is not a strict subset of local ref
> 'refs/heads/master'. maybe you are not up-to-date and need to pull first?
> error: remote 'refs/heads/origin' is not a strict subset of local ref
> 'refs/heads/origin'. maybe you are not up-to-date and need to pull first?
> error: remote 'refs/heads/stable/2.10' is not a strict subset of local
> ref 'refs/heads/stable/2.10'. maybe you are not up-to-date and need to
> pull first?
> error: remote 'refs/heads/web/master' is not a strict subset of local
> ref 'refs/heads/web/master'. maybe you are not up-to-date and need to
> pull first?

I recommend to set an explicit refspec, this prevents all this garbage
up here, i.e.

  git pull  ssh+git://address@hidden/srv/git/lilypond.git/ master:

to get the changes into your own tree and     

  git push ssh+git://address@hidden/srv/git/lilypond.git/ 
master:refs/heads/master

This should go into an alias.

Unfortunately, I don't understand the alias mechanism exactly.


Johannes, it would be nice if 

  address@hidden lilypond]$ git pull sav master:
  Already up-to-date.

would print out the completely expanded command. Otherwise, setting up
aliases is scary (because you never know what you're doing).

> As a final check, I did another pull / push.  (I was expecting the push
> to tell me that there was nothing that needed uploading)
> 
> tsubasa:~/usr/src/lilypond gperciva$ git pull gnu master
> Already up-to-date.
> tsubasa:~/usr/src/lilypond gperciva$ git push
> ssh+git://address@hidden/srv/git/lilypond.git/
> error: remote 'refs/heads/origin' is not a strict subset of local ref
> 'refs/heads/origin'. maybe you are not up-to-date and need to pull first?
> error: remote 'refs/heads/stable/2.10' is not a strict subset of local
> ref 'refs/heads/stable/2.10'. maybe you are not up-to-date and need to
> pull first?
> error: remote 'refs/heads/web/master' is not a strict subset of local
> ref 'refs/heads/web/master'. maybe you are not up-to-date and need to
> pull first?


what happens is that you didn't merge the other branches (stable and
website), so they could not be pushed.

I agree that this is confusing, but if you look closely, you'll notice
the main branch (master) is missing  from the messages above. 


-- 

Han-Wen Nienhuys - address@hidden - http://www.xs4all.nl/~hanwen

LilyPond Software Design
 -- Code for Music Notation
http://www.lilypond-design.com