GIT question - am I doing it correctly?

GIT question - am I doing it correctly?

[Piotr Hosowicz]

Hello,

Everytime I git pull tyhe Linus' sources but before I build I apply 
Peter Zijlstra's fixes, Takashi Iwai's sources and Dave Miller's 
sources. The sequence is:

# the Linus' sources
git pull

# external sources
git remote add some_name git://some_URL.git

# update
git remote update

Then configure and I build. I noticed that especially Peter's git-update 
very quickly, not as long as they did before.

Is my procedure correct? I am new to GIT.

Regards,

Piotr Hosowicz

-- 
W trosce o najmłodsze pokolenie, nasi ustawodawcy winni znowelizować
ustawę o wychowaniu w trzeźwości i przeciwdziałaniu alkoholizmowi tak,
żeby zakazać wprowadzania na rynek gier planszowych, których celem
jest jak najszybsze dotarcie do mety.
NP: Peter Green Splinter Group - Turn Your Love Away
NB: 2.6.37-rc8

Re: GIT question - am I doing it correctly?

[Michal Hocko]

On Wed 29-12-10 17:23:02, Piotr Hosowicz wrote:
> Hello,

Hi,

> 
> Everytime I git pull tyhe Linus' sources but before I build I apply
> Peter Zijlstra's fixes, Takashi Iwai's sources and Dave Miller's
> sources. The sequence is:
> 
> # the Linus' sources
> git pull
> 
> # external sources
> git remote add some_name git://some_URL.git
> 
> # update
> git remote update
> 
> Then configure and I build. I noticed that especially Peter's
> git-update very quickly, not as long as they did before.
> 
> Is my procedure correct? I am new to GIT.

What do you want to achieve? You want to build the tree that you have
added as a remote? If yes then you need to checkout a branch from that
remote

git checkout -b your_branch_name some_name/branch_you_want

then you will have a new your_branch_name which points to the tip of the
remote's branch and you can configure and make the tree.

Please note that 'git remote add && git remote update' will just add
commits from that remote tree and it doesn't affect your local copy
anyhow.

If you are new to GIT I would strongly encourage you to read through the
following ebook: http://progit.org/book/

> 
> Regards,
> 
> Piotr Hosowicz
> 
> -- 
> W trosce o najm?odsze pokolenie, nasi ustawodawcy winni znowelizowa?
> ustaw? o wychowaniu w trze?wo?ci i przeciwdzia?aniu alkoholizmowi tak,
> ?eby zakaza? wprowadzania na rynek gier planszowych, kt?rych celem
> jest jak najszybsze dotarcie do mety.
> NP: Peter Green Splinter Group - Turn Your Love Away
> NB: 2.6.37-rc8
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-- 
Michal Hocko
L3 team 
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9    
Czech Republic

Re: GIT question - am I doing it correctly?

[Piotr Hosowicz]

On 03.01.2011 14:48, Michal Hocko wrote:
> On Wed 29-12-10 17:23:02, Piotr Hosowicz wrote:
>> Hello,
>
> Hi,
>
>>
>> Everytime I git pull tyhe Linus' sources but before I build I apply
>> Peter Zijlstra's fixes, Takashi Iwai's sources and Dave Miller's
>> sources. The sequence is:
>>
>> # the Linus' sources
>> git pull
>>
>> # external sources
>> git remote add some_name git://some_URL.git
>>
>> # update
>> git remote update
>>
>> Then configure and I build. I noticed that especially Peter's
>> git-update very quickly, not as long as they did before.
>>
>> Is my procedure correct? I am new to GIT.
>
> What do you want to achieve? You want to build the tree that you have
> added as a remote? If yes then you need to checkout a branch from that
> remote
>
> git checkout -b your_branch_name some_name/branch_you_want
>
> then you will have a new your_branch_name which points to the tip of the
> remote's branch and you can configure and make the tree.
>
> Please note that 'git remote add&&  git remote update' will just add
> commits from that remote tree and it doesn't affect your local copy
> anyhow.

Well, this is exactly answer to my question, but it is straghtly 
contrary to what Peter Zijlstra wrote me. Well, I'll build the kernel 
now your way.

> If you are new to GIT I would strongly encourage you to read through the
> following ebook: http://progit.org/book/

I'am new. Thanks for the URL.

Regards,

Piotr Hosowicz

-- 
- Za moich czasów to w sklepach był tylko ocet i denaturat!
- Tato, przestań, że w całym Tesco był tylko ocet i denaturat!
NP: Peter Green Splinter Group - I Can't Help Myself
NB: 2.6.37-rc8-git3

Re: GIT question - am I doing it correctly?

[Piotr Hosowicz]

On 03.01.2011 14:48, Michal Hocko wrote:
> On Wed 29-12-10 17:23:02, Piotr Hosowicz wrote:
>> Hello,
>
> Hi,
>
>>
>> Everytime I git pull tyhe Linus' sources but before I build I apply
>> Peter Zijlstra's fixes, Takashi Iwai's sources and Dave Miller's
>> sources. The sequence is:
>>
>> # the Linus' sources
>> git pull
>>
>> # external sources
>> git remote add some_name git://some_URL.git
>>
>> # update
>> git remote update
>>
>> Then configure and I build. I noticed that especially Peter's
>> git-update very quickly, not as long as they did before.
>>
>> Is my procedure correct? I am new to GIT.
>
> What do you want to achieve?

I would like to have everything from Linus tree + additions from mmotm 
for example. How to do it? I tried to read from the URL you gave me, but 
I bet I don't understand something. How should I do it?

Regards,

Piotr Hosowicz

-- 
Z cyklu "Uroki demokracji", czyli pytania i odpowiedzi w teledurniejach:
- Jak długo trwała wojna sześciodniowa między Izraelem a Egiptem?
- (po dłuższym namyśle): Czternaście dni.
NP: Peter Green Splinter Group - Big Change Is Gonna Come
NB: 2.6.37

Re: GIT question - am I doing it correctly?

[Michal Hocko]

On Thu 06-01-11 18:04:17, Piotr Hosowicz wrote:
> On 03.01.2011 14:48, Michal Hocko wrote:
> >On Wed 29-12-10 17:23:02, Piotr Hosowicz wrote:
> >>Hello,
> >
> >Hi,
> >
> >>
> >>Everytime I git pull tyhe Linus' sources but before I build I apply
> >>Peter Zijlstra's fixes, Takashi Iwai's sources and Dave Miller's
> >>sources. The sequence is:
> >>
> >># the Linus' sources
> >>git pull
> >>
> >># external sources
> >>git remote add some_name git://some_URL.git
> >>
> >># update
> >>git remote update
> >>
> >>Then configure and I build. I noticed that especially Peter's
> >>git-update very quickly, not as long as they did before.
> >>
> >>Is my procedure correct? I am new to GIT.
> >
> >What do you want to achieve?
> 
> I would like to have everything from Linus tree + additions from
> mmotm for example.

Andrew maintains mmotm as a quilt tree AFAIK, though there is some
initiative to have also a git tree which mirrors it
(http://lwn.net/Articles/311677/).  Btw. mmotm contains Linus tree (from
certain point of time).

Anyway, you can add what-ever git tree as a new remote. This basically
means that you can fetch commits from that tree into your local git
"database" and checkout out any of them as a branch (please note that if
the remote shares commits with your trees then you commit just the
additional ones). 

If you add a remote it doesn't mean that you stack that tree on top of
the original one. It is all just about commits which have their parents
so they form a history (very roughtly). You will find more about remotes
here: http://progit.org/book/ch2-5.html.

> Regards,
> 
> Piotr Hosowicz
> 
> -- 
> Z cyklu "Uroki demokracji", czyli pytania i odpowiedzi w teledurniejach:
> - Jak d?ugo trwa?a wojna sze?ciodniowa mi?dzy Izraelem a Egiptem?
> - (po d?u?szym namy?le): Czterna?cie dni.
> NP: Peter Green Splinter Group - Big Change Is Gonna Come
> NB: 2.6.37

-- 
Michal Hocko
L3 team 
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9    
Czech Republic