I broke git again

[Graham Percival]

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


I don't know how it happened, but here's what I did:

About 1pm, I did a "git pull gnu master" (having set up this shortcut 
following Dscho's instructions).  This was the first time in one or two 
weeks.  Everything looked normal.

I read some emails and edited one file.  I did a "git commit 
path/to/file" and everything looked fine.
http://git.sv.gnu.org/gitweb/?p=lilypond.git;a=commit;h=c201c41c44b93520081c497ab48cc2701be5d8d6

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 then did a pull, of course.  Everything looked ok.

Then I tried another push:
tsubasa:~/usr/src/lilypond gperciva$ git push 
ssh+git://address@hidden/srv/git/lilypond.git/
updating 'refs/heads/master'
  from 71226500089f0ad44cec822ec3320be12e2c2b01
  to   3cac541f96771eb56fc4063df3d9a9ac765bc551
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?
Generating pack...
... (this output looks normal)...
refs/heads/master: 71226500089f0ad44cec822ec3320be12e2c2b01 -> 
3cac541f96771eb56fc4063df3d9a9ac765bc551


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?


Awaiting instructions from my new git overlords,
- Graham