Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"

[Johannes Schindelin]

Hi,

On Tue, 11 Aug 2009, Maximilian Albert wrote:

> 2009/8/11 Johannes Schindelin <address@hidden>:
> 
> >  It actually only gives you a "Clone/Update" button that makes sure 
> > that a local clone (hardcoded to $HOME/lilypond) is up-to-date, but at 
> > least it has a progress bar, and I verified that it works even on 
> > Windows (what with its ridiculous insistence to put everything into 
> > directories containing spaces).
> 
> When I try that script, I end up with an "empty" directory (i.e., only 
> the .git subdirectory is present). Running "git status" says that all 
> the files in the source tree were deleted. I can thus recreate them by 
> running "git reset --hard HEAD". What's happening here?

It actually worked here, twice.

But you have this wonderful output field in the GUI, what does it have to 
say?  I imagine that it gave you some error message or some such (probably 
due to an older Git version that refuses to update the current 'master' 
branch -- which has no commit yet, though).

So I would like to ask you two things: first, what was the error message 
(there must have been one), and second: could you change the

        git checkout -b master origin/master

to

        git reset --hard origin/master
        git config branch.master.remote origin
        git config branch.master.merge refs/heads/master

?

Thanks,
Dscho