[Gta04-owner] 3.2-rc6-gta04 - another week, another rc.

[Klaus 'mrmoku' Kurzmann]

On Mon, 19 Dec 2011, Johannes Schauer wrote:

> Hi,

> On Mon, Dec 19, 2011 at 11:14:52AM +1100, NeilBrown wrote:
> > 
> > Hi,
> >  git://neil.brown.name/gta04 merge
> > 
> > is now based on 3.2-rc6.

> Thank you so much for your work :)

indeed :)

> Let me ask something related to your git repository...

> First of all a git clone is quite slow due to the kernel history being a
> few gigabytes big and the server not being very fast. I dont really want
> to stress your server with downloading gigabytes of data just to run
> `make uImage` as I would just need the plain directory tree.

> I was told svn has a functionality that offers what I want called `svn
> export` git is lacking this but I found out about this beauty:

> git archive --format=tar --prefix=PROJECT_NAME/ --remote=USER at SERVER:PROJECT_NAME.git master | tar -xf -

> which should just get the plain file/directory structure just as I
> wanted but

> git archive --format=tar --remote=git://neil.brown.name/gta04 --prefix=gta04-kernel-neil master | tar -xf -

> exits with:

> fatal: The remote end hung up unexpectedly

> I do not know the reason but maybe you would like to have this
> functionality working to reduce stress on your server? Hence just
> mentioning it...

> Secondly, I already have a full clone of your repository here but when
> you advertise a new release of yours I have trouble incorporating these
> changes into my local repository. Just doing `git pull` as I'm used to
> would result into problems like:

> Your branch and 'origin/merge' have diverged, and have 47 and 238
> different commit(s) each, respectively.

That is because he is rebasing his branch to follow the linux master
tree. 

> To people knowing more git than me: how would I update my copy of neil's
> repository properly step by step?

git fetch gta04-neil; git reset --hard gta04-neil/merge

is what I'm doing (take care to have checked out the correct branch
before the reset!).

(gta04-neil is my git remote name for Neil's repository - if you
directly cloned from there that would be origin for you).



> > Merry Christmas and/or Seasons Greetings and/or Happy New Year (though
> > I'll probably have another release before the (western) New Year)

> likewise!


> cheers, josch

-- 
Klaus 'mrmoku' Kurzmann