All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Mike Galbraith <efault@gmx.de>
Cc: git <git@vger.kernel.org>
Subject: Re: pulling Already up-to-date linux-2.6 repo takes ~8 minutes?
Date: Thu, 18 Oct 2007 00:50:02 -0400	[thread overview]
Message-ID: <20071018045001.GA14735@spearce.org> (raw)
In-Reply-To: <1192678865.20353.14.camel@Homer.simpson.net>

Mike Galbraith <efault@gmx.de> wrote:
> git_pull_linus scriptlet:
> 
> #!/bin/sh
> (cd linux-2.6; git pull git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git)
> (cd linux-2.6; git pull -t git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git)
> 
> root@Homer: time ./git_pull_linus
...
> remote: Total 48507 (delta 38878), reused 44654 (delta 35166)

Well, Linus and crew are pretty busy beavers.  Its shocking how
fast they can make a dam^H^H^Hoperating system better.  :-)

...
> Already up-to-date.
> You are not currently on a branch; you must explicitly
> specify which branch you wish to merge:
>   git pull <remote> <branch>

The problem here is you aren't on a branch, you are on a detached
HEAD.  So we must have setup the wrong thing in .git/FETCH_HEAD
and we didn't actually merge.

What version of git is this, exactly (`git version`)?


I'd suggest making your life a little bit easier.  Consider creating
a remote that points to Linus:

  $ git remote add linus git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
  $ git checkout -b master   ; # or any other branch
  $ git config branch.master.remote linus
  $ git config branch.master.merge refs/heads/master

Now you can update from Linus with just:

  $ git pull

Provided you are on branch "master", or whatever other branches
you setup those branch.*.remote and branch.*.merge configuration
options for.

-- 
Shawn.

  reply	other threads:[~2007-10-18  4:50 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-18  3:41 pulling Already up-to-date linux-2.6 repo takes ~8 minutes? Mike Galbraith
2007-10-18  4:50 ` Shawn O. Pearce [this message]
2007-10-18  5:09   ` Mike Galbraith
2007-10-18  5:39     ` Mike Galbraith
2007-10-18  5:42       ` Mike Galbraith
2007-10-18  5:48       ` Shawn O. Pearce
2007-10-18  5:54         ` Mike Galbraith
2007-10-18  5:57           ` Shawn O. Pearce
2007-10-18  6:05             ` Mike Galbraith

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071018045001.GA14735@spearce.org \
    --to=spearce@spearce.org \
    --cc=efault@gmx.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.