lkml.org 
[lkml]   [2008]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT pull] x86 fixes for 2.6.26
2008/5/19 Linus Torvalds <torvalds@linux-foundation.org>:
>
>
> On Mon, 19 May 2008, Jesper Juhl wrote:
>>
>> Ok, thanks a lot. Now, I have one final question for you.
>> In order to be able to play around with the patches, see if they
>> apply, fix them up, test for merge conflicts etc etc, I obviously need
>> a tree with content, not just a bare tree. But I see on
>> master.kernel.org that all the published trees are bare trees.
>
> I think just about *everybody* does their own development on their own
> machine. I know I do, and I'm pretty certain that everybody else does too.
> Then we just upload the end result to master.kernel.org into a bare
> repository that is only used for exporting to others, never for anything
> else.
>
>> So, I assume I create a tree in my homedir like so;
>> $ git clone -l -s /pub/scm/linux/kernel/git/torvalds/linux-2.6.git /home/juhl/trivial-work-tree
>> create all the branches and do all the work in that one,
>
> You can do that, and actually work on master.kernel.org, but do you really
> want to?
>
Not if I can help it, no. I just couldn't work out from the git docs
how to do it otherwise when working with kernel.org and bare trees.

<snip>
> Then, the easiest way to publish the result is to just create a bare
> repository on master.kernel.org, and push to it. And just make sure that
> you pre-populate that bare repo with my tree, so that when you push from
> your home machine, it only pushes the (smallish) actual changes!
>
> So the workflow I'd suggest is:
>
> - do all the work on your own hardware
>
> - create the initial (bare) kernel.org tree with
>
> cd /pub/scm/linux/kernel/git/juhl
> git clone --bare -l -s ../torvalds/linux-2.6 trivial-2.6
>
> - then just push to that tree from your own machine
>
> and voila, you're all done.
>
<snip>

That worked beautifully. Thanks a lot.


Stephen: There is now a trivial-2.6.git tree at
git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git
with a 'next' branch that you can pull into linux-next, please.

git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git next

Once we hit a merge window I'll rename the 'next' branch and ask Linus
to pull it, then create a new 'next'.

--
Jesper Juhl <jesper.juhl@gmail.com>
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please http://www.expita.com/nomime.html


\
 
 \ /
  Last update: 2008-05-20 02:03    [W:0.050 / U:37.824 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site