[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: lilycontrib.tcl, was Re: the "r" in "git pull -r"
From: |
Maximilian Albert |
Subject: |
Re: lilycontrib.tcl, was Re: the "r" in "git pull -r" |
Date: |
Tue, 11 Aug 2009 18:12:54 +0900 |
2009/8/11 Johannes Schindelin <address@hidden>:
> 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).
Sorry, I should of course have posted the output in the first place:
==>
Initialized empty Git repository in /home/username/lilypond/.git/
>From git://repo.or.cz/lilypond
* [new branch] master -> origin/master
warning: You appear to be on a branch yet to be born.
warning: Forcing checkout of origin/master.
Already on "master"
Branch master set up to track remote branch refs/remotes/origin/master.
<==
So it doesn't give an error, just a warning. But AFAIR I have seen
this warning on my non-GUI-based checkouts, too, even though
everything worked fine. BTW, my git version is 1.6.0.4 (the latest one
that Ubuntu 9.04 has to offer).
> 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
>
> ?
Still no luck. :-( The warning is gone, but the result is as before
(directory is empty, 'git status' reports deleted files). Here is the
output of the new script:
==>
Initialized empty Git repository in /home/username/lilypond/.git/
>From git://repo.or.cz/lilypond
* [new branch] master -> origin/master
HEAD is now at 00c6cac Nitpick: ly:spanner-bound grob name slur -> spanner.
<==
Thanks for your help,
Max
P.S.: It would be nice to let the script print a short message when
it's finished so that the user know when to stop waiting. ;-)
- Re: the "r" in "git pull -r", (continued)
- Re: the "r" in "git pull -r", Carl Sorensen, 2009/08/09
- Re: the "r" in "git pull -r", Graham Percival, 2009/08/09
- Re: the "r" in "git pull -r", Trevor Daniels, 2009/08/10
- Re: the "r" in "git pull -r", Graham Percival, 2009/08/10
- Re: the "r" in "git pull -r", Johannes Schindelin, 2009/08/10
- Re: the "r" in "git pull -r", Graham Percival, 2009/08/10
- Re: the "r" in "git pull -r", Johannes Schindelin, 2009/08/10
- lilycontrib.tcl, was Re: the "r" in "git pull -r", Johannes Schindelin, 2009/08/10
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Maximilian Albert, 2009/08/11
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Johannes Schindelin, 2009/08/11
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r",
Maximilian Albert <=
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Jonathan Kulp, 2009/08/11
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Johannes Schindelin, 2009/08/11
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Maximilian Albert, 2009/08/11
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Johannes Schindelin, 2009/08/11
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Maximilian Albert, 2009/08/11
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Johannes Schindelin, 2009/08/11
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Maximilian Albert, 2009/08/12
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Johannes Schindelin, 2009/08/12
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Maximilian Albert, 2009/08/12
- Re: lilycontrib.tcl, was Re: the "r" in "git pull -r", Johannes Schindelin, 2009/08/11