{"thread":{"id":"10351","subject":"pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","startedAt":"2007-10-18T03:41:05Z","lastAt":"2007-10-18T06:05:39Z","messageCount":9,"participants":["Mike Galbraith","Shawn O. Pearce"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"56329","messageId":"1192678865.20353.14.camel@Homer.simpson.net","threadId":"10351","inReplyTo":null,"subject":"pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","fromName":"Mike Galbraith","fromEmail":"efault@gmx.de","sentAt":"2007-10-18T03:41:05Z","receivedAt":"2007-10-18T03:41:05Z","isPatch":false,"sender":{"key":"efault@gmx.de","avatar":null},"body":"Greetings git gods,\n\nI'm wondering if I'm not doing something wrong, and thereby putting\nunneeded stress on kernel.org when I pull latest kernel tree.\n\ngit_pull_linus scriptlet:\n\n#!/bin/sh\n(cd linux-2.6; git pull\ngit://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git)\n(cd linux-2.6; git pull -t\ngit://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git)\n\nroot@Homer: time ./git_pull_linus\nremote: Generating pack...\nremote: Counting objects: 17746\nremote: Done counting 55975 objects.\nremote: Result has 48507 objects.\nremote: Deltifying 48507 objects...\nremote:  100% (48507/48507) done\nIndexing 48507 objects...\nremote: Total 48507 (delta 38878), reused 44654 (delta 35166)\n 100% (48507/48507) done\nResolving 38878 deltas...\n 100% (38878/38878) done\n3419 objects were added to complete this thin pack.\nAlready up-to-date.\nYou are not currently on a branch; you must explicitly\nspecify which branch you wish to merge:\n  git pull <remote> <branch>\n\nreal    7m57.429s\nuser    0m13.517s\nsys     0m0.859s\n\n8 minutes, truckloads of network traffic, and lord knows what all going\non at the other end just doesn't seem right.  /me == dummy?\n\n\t-Mike\n"},{"id":"56336","messageId":"20071018045001.GA14735@spearce.org","threadId":"10351","inReplyTo":"1192678865.20353.14.camel@Homer.simpson.net","subject":"Re: pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-10-18T04:50:02Z","receivedAt":"2007-10-18T04:50:02Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Mike Galbraith <efault@gmx.de> wrote:\n> git_pull_linus scriptlet:\n> \n> #!/bin/sh\n> (cd linux-2.6; git pull git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git)\n> (cd linux-2.6; git pull -t git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git)\n> \n> root@Homer: time ./git_pull_linus\n...\n> remote: Total 48507 (delta 38878), reused 44654 (delta 35166)\n\nWell, Linus and crew are pretty busy beavers.  Its shocking how\nfast they can make a dam^H^H^Hoperating system better.  :-)\n\n...\n> Already up-to-date.\n> You are not currently on a branch; you must explicitly\n> specify which branch you wish to merge:\n>   git pull <remote> <branch>\n\nThe problem here is you aren't on a branch, you are on a detached\nHEAD.  So we must have setup the wrong thing in .git/FETCH_HEAD\nand we didn't actually merge.\n\nWhat version of git is this, exactly (`git version`)?\n\n\nI'd suggest making your life a little bit easier.  Consider creating\na remote that points to Linus:\n\n  $ git remote add linus git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n  $ git checkout -b master   ; # or any other branch\n  $ git config branch.master.remote linus\n  $ git config branch.master.merge refs/heads/master\n\nNow you can update from Linus with just:\n\n  $ git pull\n\nProvided you are on branch \"master\", or whatever other branches\nyou setup those branch.*.remote and branch.*.merge configuration\noptions for.\n\n-- \nShawn.\n"},{"id":"56344","messageId":"1192684150.7390.15.camel@Homer.simpson.net","threadId":"10351","inReplyTo":"20071018045001.GA14735@spearce.org","subject":"Re: pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","fromName":"Mike Galbraith","fromEmail":"efault@gmx.de","sentAt":"2007-10-18T05:09:10Z","receivedAt":"2007-10-18T05:09:10Z","isPatch":false,"sender":{"key":"efault@gmx.de","avatar":null},"body":"On Thu, 2007-10-18 at 00:50 -0400, Shawn O. Pearce wrote:\n\n> The problem here is you aren't on a branch, you are on a detached\n> HEAD.  So we must have setup the wrong thing in .git/FETCH_HEAD\n> and we didn't actually merge.\n\nAha.  (I didn't setup anything that I can recall, followed a howto I\nfound)\n\n> What version of git is this, exactly (`git version`)?\n\ngit version 1.5.3.4.203.gcc61a\n\n> I'd suggest making your life a little bit easier.  Consider creating\n> a remote that points to Linus:\n> \n>   $ git remote add linus git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n>   $ git checkout -b master   ; # or any other branch\n>   $ git config branch.master.remote linus\n>   $ git config branch.master.merge refs/heads/master\n> \n> Now you can update from Linus with just:\n> \n>   $ git pull\n> \n> Provided you are on branch \"master\", or whatever other branches\n> you setup those branch.*.remote and branch.*.merge configuration\n> options for.\n\nThanks, I appreciate it, kernel.org likely does too.\n\n\t-Mike\n"},{"id":"56350","messageId":"1192685971.7390.21.camel@Homer.simpson.net","threadId":"10351","inReplyTo":"1192684150.7390.15.camel@Homer.simpson.net","subject":"Re: pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","fromName":"Mike Galbraith","fromEmail":"efault@gmx.de","sentAt":"2007-10-18T05:39:31Z","receivedAt":"2007-10-18T05:39:31Z","isPatch":false,"sender":{"key":"efault@gmx.de","avatar":null},"body":"On Thu, 2007-10-18 at 07:09 +0200, Mike Galbraith wrote:\n\n> > I'd suggest making your life a little bit easier.  Consider creating\n> > a remote that points to Linus:\n> > \n> >   $ git remote add linus git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n> >   $ git checkout -b master   ; # or any other branch\n> >   $ git config branch.master.remote linus\n> >   $ git config branch.master.merge refs/heads/master\n\nDang.  git was happy with everything above except the checkout -b\nmaster, so I can't get off the dangling limb I'm on, and onto a solid\nbranch.\n\nroot@Homer: git checkout -b master\ngit checkout: branch master already exists\nroot@Homer: git branch\n* (no branch)\n  master\nroot@Homer: time git pull\nremote: Generating pack...\nremote: Counting objects: 18672\nremote: Done counting 55975 objects.\nremote: Result has 48507 objects.\nremote: Deltifying 48507 objects...\nremote:  100% (48507/48507) done\nIndexing 48507 objects...\nremote: Total 48507 (delta 38878), reused 44654 (delta 35166)\n 100% (48507/48507) done\nResolving 38878 deltas...\n 100% (38878/38878) done\n3419 objects were added to complete this thin pack.\n* refs/remotes/origin/master: fast forward to branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n  old..new: 86a71db..d85714d\nYou are not currently on a branch; you must explicitly\nspecify which branch you wish to merge:\n  git pull <remote> <branch>\n\nreal    8m12.676s\nuser    0m29.621s\nsys     0m2.763s\n"},{"id":"56351","messageId":"1192686174.7390.23.camel@Homer.simpson.net","threadId":"10351","inReplyTo":"1192685971.7390.21.camel@Homer.simpson.net","subject":"Re: pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","fromName":"Mike Galbraith","fromEmail":"efault@gmx.de","sentAt":"2007-10-18T05:42:54Z","receivedAt":"2007-10-18T05:42:54Z","isPatch":false,"sender":{"key":"efault@gmx.de","avatar":null},"body":"On Thu, 2007-10-18 at 07:39 +0200, Mike Galbraith wrote:\n> On Thu, 2007-10-18 at 07:09 +0200, Mike Galbraith wrote:\n> \n> > > I'd suggest making your life a little bit easier.  Consider creating\n> > > a remote that points to Linus:\n> > > \n> > >   $ git remote add linus git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n> > >   $ git checkout -b master   ; # or any other branch\n> > >   $ git config branch.master.remote linus\n> > >   $ git config branch.master.merge refs/heads/master\n> \n> Dang.  git was happy with everything above except the checkout -b\n> master, so I can't get off the dangling limb I'm on, and onto a solid\n> branch.\n\nPff.  -f.\n\nThanks, ~4 second pull is MUCH better :)\n\n\t-Mike\n"},{"id":"56353","messageId":"20071018054834.GH14735@spearce.org","threadId":"10351","inReplyTo":"1192685971.7390.21.camel@Homer.simpson.net","subject":"Re: pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-10-18T05:48:34Z","receivedAt":"2007-10-18T05:48:34Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Mike Galbraith <efault@gmx.de> wrote:\n> Dang.  git was happy with everything above except the checkout -b\n> master, so I can't get off the dangling limb I'm on, and onto a solid\n> branch.\n> \n> root@Homer: git checkout -b master\n> git checkout: branch master already exists\n> root@Homer: git branch\n> * (no branch)\n>   master\n\nLook to see if there's anything on your current master branch that\nyou don't want/need anymore:\n\n\t$ git log ..master\n\nIf that comes up empty (no output) or you mean to discard those\nchanges then you can just force create the branch and check it out:\n\n\t$ git branch -f master\n\t$ git checkout master\n\nOn the other hand if you want to keep those changes then you should\nconsider creating a different branch than master, or merging master\nfirst:\n\n\t$ git merge master\n\n\n> root@Homer: time git pull\n> remote: Total 48507 (delta 38878), reused 44654 (delta 35166)\n...\n\nWell, you downloaded everything again.  However...\n\n> 3419 objects were added to complete this thin pack.\n> * refs/remotes/origin/master: fast forward to branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n>   old..new: 86a71db..d85714d\n\nThis time we actually stored a remote tracking branch.\n\nSo although we didn't actually merge Linus' current version into\nyour detached HEAD we did save it under a remote tracking branch\n(named \"origin/master\") so the next time you run git-pull we won't\nactually need to download that data again.  We already have it,\nand know we have it.\n\nIts just not in your current branch.\n\n> You are not currently on a branch; you must explicitly\n> specify which branch you wish to merge:\n>   git pull <remote> <branch>\n\nIf you finish switching to a real branch with a configured remote\nand merge entry then this message should go away and you should be\nable to efficiently pull Linus' tree into your own.\n\n-- \nShawn.\n"},{"id":"56354","messageId":"1192686882.9097.2.camel@Homer.simpson.net","threadId":"10351","inReplyTo":"20071018054834.GH14735@spearce.org","subject":"Re: pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","fromName":"Mike Galbraith","fromEmail":"efault@gmx.de","sentAt":"2007-10-18T05:54:42Z","receivedAt":"2007-10-18T05:54:42Z","isPatch":false,"sender":{"key":"efault@gmx.de","avatar":null},"body":"On Thu, 2007-10-18 at 01:48 -0400, Shawn O. Pearce wrote:\n\n> Look to see if there's anything on your current master branch that\n> you don't want/need anymore:\n> \n> \t$ git log ..master\n\ngit trees here are meant to be absolutely virgin, so...\n\n> If that comes up empty (no output) or you mean to discard those\n> changes then you can just force create the branch and check it out:\n> \n> \t$ git branch -f master\n> \t$ git checkout master\n\nThanks again, I'm off my dangling limb.\n\n\t-Mike\n"},{"id":"56355","messageId":"20071018055729.GI14735@spearce.org","threadId":"10351","inReplyTo":"1192686882.9097.2.camel@Homer.simpson.net","subject":"Re: pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-10-18T05:57:29Z","receivedAt":"2007-10-18T05:57:29Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Mike Galbraith <efault@gmx.de> wrote:\n> On Thu, 2007-10-18 at 01:48 -0400, Shawn O. Pearce wrote:\n> \n> > Look to see if there's anything on your current master branch that\n> > you don't want/need anymore:\n> > \n> > \t$ git log ..master\n> \n> git trees here are meant to be absolutely virgin, so...\n\nWhaa?  You found something that's better for manging the kernel\nsources then Git?  ;-)\n \n> Thanks again, I'm off my dangling limb.\n\nGood to hear.  I hate being out on a limb and not having a rope to\nclimb down with.\n\n-- \nShawn.\n"},{"id":"56357","messageId":"1192687539.9097.7.camel@Homer.simpson.net","threadId":"10351","inReplyTo":"20071018055729.GI14735@spearce.org","subject":"Re: pulling Already up-to-date linux-2.6 repo takes ~8 minutes?","fromName":"Mike Galbraith","fromEmail":"efault@gmx.de","sentAt":"2007-10-18T06:05:39Z","receivedAt":"2007-10-18T06:05:39Z","isPatch":false,"sender":{"key":"efault@gmx.de","avatar":null},"body":"On Thu, 2007-10-18 at 01:57 -0400, Shawn O. Pearce wrote:\n> Mike Galbraith <efault@gmx.de> wrote:\n> > On Thu, 2007-10-18 at 01:48 -0400, Shawn O. Pearce wrote:\n> > \n> > > Look to see if there's anything on your current master branch that\n> > > you don't want/need anymore:\n> > > \n> > > \t$ git log ..master\n> > \n> > git trees here are meant to be absolutely virgin, so...\n> \n> Whaa?  You found something that's better for manging the kernel\n> sources then Git?  ;-)\n\ncp vi diff patch :)  I'm crawling toward the 20th century though.  The\ntiny bit of git functionality I do use is pretty darn spiffy. \n\n\t-Mike\n"}]}