xfs
[Top] [All Lists]

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

To: Niv Sardi <xaiki@xxxxxxx>
Subject: Re: New XFS git tree on oss.sgi.com
From: Russell Cattelan <cattelan@xxxxxxxxxxx>
Date: Tue, 09 Dec 2008 18:07:13 -0600
Cc: Russell Cattelan <cattelan@xxxxxxxxxxx>, Christoph Hellwig <hch@xxxxxxxxxxxxx>, xfs@xxxxxxxxxxx
In-reply-to: <nccvdtthtyi.fsf@itchy.melbourne.sgi.com>
References: <492BA7AD.5080007@sgi.com> <20081125081644.GA20644@infradead.org> <492C0B3D.3040002@thebarn.com> <492CA07F.1030803@sgi.com> <492CC201.3080304@xfs.org> <ncc3ah6lyiw.fsf@itchy.melbourne.sgi.com> <20081209091725.GA26180@infradead.org> <493E9AB4.1050505@xfs.org> <nccvdtthtyi.fsf@itchy.melbourne.sgi.com>
User-agent: Thunderbird 2.0.0.6 (Macintosh/20070728)
Niv Sardi wrote:
Russell Cattelan <cattelan@xxxxxxxxxxx> writes:

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.

Please read git documentation.
seriously?! you need to say this?

You don't want to be pulling xfs-dev into a xfs/master tree, you should
setup a remote properly and have local branch tracking them.
Ya and this is a non trivial thing to do without proper instructions.

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!

http://xfs.org/index.php?title=Main_Page&action=submit
--> out of captcha images; this shouldn't happen
Ok fixed.
you can read this:
Sigh ....
Honestly you think ptools info is useful here?

------------------------------------------------------------------------


if you s/git.melbourne.sgi.com/oss.sgi.com/

Cheers,

<Prev in Thread] Current Thread [Next in Thread>