Re: New XFS git tree on oss.sgi.com

[Russell Cattelan <cattelan@xxxxxxxxxxx>]

Christoph Hellwig wrote:
> Now that the xfs-dev branch was updated after a while I tried a git pull
> an get a useless error message:
>
>   
I agree that is a worthless error message and does nothing to really 
tell you what the problem is.

The problem is that you have a tracking branch for xfs-dev so git wants 
to leave your branch untouched
until you actually want to update it from the remote branch origin/xfs-dev
What you can do is:
% git-fetch
% git-pull . xfs-dev

That will pull the latest xfs-dev stuff into your current branch.

> hch@bigmac:~/work/xfs-dev$ git-pull 
> You asked me to pull without telling me which branch you
> want to merge with, and 'branch.origin/xfs-dev.merge' in
> your configuration file does not tell me either.  Please
> name which branch you want to merge on the command line and
> try again (e.g. 'git pull <repository> <refspec>').
> See git-pull(1) for details on the refspec.
>
> If you often merge with the same branch, you may want to
> configure the following variables in your configuration
> file:
>
>     branch.origin/xfs-dev.remote = <nickname>
>     branch.origin/xfs-dev.merge = <remote-ref>
>     remote.<nickname>.url = <url>
>     remote.<nickname>.fetch = <refspec>
>
> See git-config(1) for details.
>
>
> Can you please make each of the current branches a proper git tree
> that is easy to work with?  Alternatively I'll just completely stop
> bothering with the dev tree if it's such a pain in the ass.
>
>   
of course this would be so damn confusing if somebody would document the 
procedures someplace?!

Hmm I wonder where we could do that.... ohh wait maybe the WIKI!