Re: Uploading a patch to Rietveld

[Phil Holmes]

----- Original Message ----- 
From: "Graham Percival" <address@hidden>
To: "Phil Holmes" <address@hidden>
Cc: <address@hidden>
Sent: Monday, May 02, 2011 2:08 PM
Subject: Re: Uploading a patch to Rietveld


> On Mon, May 02, 2011 at 01:41:50PM +0100, Phil Holmes wrote:
> > ----- Original Message ----- From: "Graham Percival"
> > >- have you rebooted?  IIRC the ubuntu startup scripts
> >
> > No.  I have now, and git cl now works :-)  Except I get a failure like 
> > this:
> >
> > address@hidden:~/lilypond-git$ git cl upload origin/master
> > make/website.make                             |    2 +
> > scripts/build/extract_texi_filenames.py       |   22 +++++++++++++--
> > scripts/build/website-known-missing-files.txt |   37
> > +++++++++++++++++++++++++
> > 3 files changed, 58 insertions(+), 3 deletions(-)
> > fatal: ref HEAD is not a symbolic ref
> > Command "git symbolic-ref HEAD" failed.
>
>
> Yikes, that's some fundamental git thing.  Hmm.  Begin by doing
>  git format-patch origin
> and move the file out of your git dir to be safe.  Then try some
> combination of
>  git status
>  git checkout master
>  git status
>  git pull -r
>  git status
> (if panic, and only after double-checking that your patch is safe)
>  git reset --hard origin
>
> oh wait, instead of that last step, you should use the red button
> in lily-git.tcl
>
> Cheers,
> - Graham

In the end, I nuked the git directory (having copied my changes elsewhere) 
and started from scratch.  It's at http://codereview.appspot.com/4428077/ 
but hopefully this should be announced properly.

--
Phil Holmes