Re: GOP-PROP 3: C++ formatting

[Carl Sorensen]

On 6/22/11 3:53 PM, "Graham Percival" <address@hidden> wrote:

> On Wed, Jun 22, 2011 at 01:34:42PM +0200, Jan Warchoł wrote:
>> 2011/6/22 Graham Percival <address@hidden>:
>>> There are plenty of differences.  If you get the git diff command
>>> to work, you'll see.
>> 
>> It still doesn't work. I'm in top source directory, on branch master
>> which is up to date (and git diff origin/master shows no differencies)
>> and when i call
>> git diff origin/dev/gperciva-fixcc origin/dev/gperciva-astyle
>> i get the same error:
>> 
>> fatal: ambiguous argument 'origin/dev/gperciva-fixcc': unknown
>> revision or path not in the working tree.
> 
> Ah wait, are you using lilydev (or did you follow the CG git
> instructions)?  If you got the master branch specifically instead
> of doing a general git clone, then you won't have those branches.
> 
> The simplest way to get them is to do a git clone.  There's a way
> to add specific branches to your existing git tree, so if you feel
> like hunting around through git docs and blogs and stuff, I'm sure
> you can find it there.  Actually, I vaguely recall that there's
> something in the CG about adding branches... in the old days, we
> had web/ on a separate branch, so we needed instructions about
> that.
> 
> 
> I suppose we should update the CG git instructions to use git
> clone rather than the master-branch-only method.

Perhaps.  I have resisted doing a clone because I don't want to stuff my git
repository full.  But I may be stupid to behave that way.

For the short term, you can do

git pull origin dev/gperciva-fixcc
git pull origin dev/gperciva-astyle

to get those branches.

HTH,

Carl