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

[NeilBrown]

On Mon, 19 Dec 2011 12:23:41 +0100 Johannes Schauer <j.schauer at email.de>
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 :)
> 
> 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.

Not the server being stressed so much as the network link.  The server is in
my garage so you have to pull over the up-link of my ADSL connection which
isn't super-fast.

The best way to get my code is to get a git repository for anywhere that has
the latest from Linus, then

  git fetch git://neil.brown.name/gta04 merge
  git checkout FETCH_HEAD

that will just pull the changes you need which should be very fast.

> 
> 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.
> 
> To people knowing more git than me: how would I update my copy of neil's
> repository properly step by step?

"git pull" doesn't work if the repository is being rebased, and I
particularly do want to regularly rebase so I can through things out and
notice when my changes have been incorporated upstream.

So use "git fetch" as above.
If you want a branch name you might:

   git branch -D foo
   git fetch git://neil.brown.name/gta04 merge
   git checkout -b foo FETCH_HEAD

or something like that.

Maybe you can

   git remote add -t merge gta04  git://neil.brown.name

Then

   git fetch gta04

will fetch the right branch and

   git checkout gta04/merge

will check it out (I think).

NeilBrown


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 828 bytes
Desc: not available
URL: <http://lists.goldelico.com/pipermail/gta04-owner/attachments/20111219/90315a36/attachment.bin>