{"thread":{"id":"6787","subject":"Pulling from branches.","startedAt":"2007-02-12T23:06:58Z","lastAt":"2007-02-12T23:06:58Z","messageCount":1,"participants":["Nigel Cunningham"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"34331","messageId":"1171321618.4081.72.camel@nigel.suspend2.net","threadId":"6787","inReplyTo":null,"subject":"Pulling from branches.","fromName":"Nigel Cunningham","fromEmail":"nigel@nigel.suspend2.net","sentAt":"2007-02-12T23:06:58Z","receivedAt":"2007-02-12T23:06:58Z","isPatch":false,"sender":{"key":"nigel@nigel.suspend2.net","avatar":null},"body":"Hi.\n\nI have a problem with pulling from branches, and am wondering if it's\njust because I'm ignorant. :>\n\nLocally, I have a single git tree with multiple branches:\n\nnigel@nigel:/usr/src/stg-tree$ cg status -g\nHeads:\n    edgy                        80b8e66e4b7ed12b8918c4440e37fd0bc898bd15\n  R linux-2.6.16.x-local        6d44d60a6b7d1cbd24efbd62e51eb3287de9ed46\n  R linux-2.6.17.x              78ace17e51d4968ed2355e8f708d233d1cc37f6d\n  R linux-2.6.17.x-local        78ace17e51d4968ed2355e8f708d233d1cc37f6d\n  R linux-2.6.18.x              03739b5cc1b86536d662b89ce935b0ee68977e23\n  R linux-2.6.18.x-local        03739b5cc1b86536d662b89ce935b0ee68977e23\n  R linux-2.6.19.x              b321cb58a311d172a3370029324b653e0b1d7041\n  R linux-2.6.19.x-local        b321cb58a311d172a3370029324b653e0b1d7041\n  R linux-2.6.20.x              62d0cfcb27cf755cebdc93ca95dabc83608007cd\n    merge                       8df8d08ae56a89f5f6084f88818d272a6a3d4067\n  R mm                          bee8d431ab4bdeade78a09d02e0a0e8dcd36958b\n  R origin                      509cb37e173d4e39cec47238397e91b718730794\n  R suspend2                    07807bff2f1389a97b452f91c75a9f3625d35677\n    suspend2-2.6.17.x           87cff8ff1a1fccdbb3e136938e88613acb5779d6\n    suspend2-2.6.18             c3bb4bc6a5c406d6562f17375508a72cfcf3fd28\n   >suspend2-2.6.19             b321cb58a311d172a3370029324b653e0b1d7041\n    suspend2-2.6.20             62d0cfcb27cf755cebdc93ca95dabc83608007cd\n    suspend2-mm                 7c6fa3df53e6e87863362d1e902eea41bc35c29c\n  R ubuntu-2.6                  a1c9237fa8a5721a708b9385c67a81d93b549200\n  R ubuntu-2.6-local            a1c9237fa8a5721a708b9385c67a81d93b549200\n    ubuntu-2.6-suspend2         1c5c746fb366d4ebb1b2887ccc15cfb0186bf260\n  R ubuntu-edgy                 08e00172cfa4ef20f0791fc925d2c43019f7c083\n  R ubuntu-edgy-local           08e00172cfa4ef20f0791fc925d2c43019f7c083\n    ubuntu-edgy-suspend2        a42d599b474d86d6142fddac81b7eba41f5e92db\n\nI pull from Linus' tree (origin), and from the various stable branches\n(linux-2.6.n.x - forget now why I have the -local ones, but it works so\nI'm not touching it!) and Ben's ubuntu-2.6 and so on.\n\n>From there, I have suspend2- branches that are stg trees, which apply\nSuspend2 to the various versions.\n\nSo I tend to do:\nnigel@nigel:/usr/src/stg-tree$ update-trees suspend2-2.6.19\n\nTree is suspend2-2.6.19\nOrigin is linux-2.6.19.x-local\nRemote is linux-2.6.19.x\n\ngit checkout -f linux-2.6.19.x-local\ncg fetch linux-2.6.19.x\nFetching pack (head and objects)...\nFetching tags...\nfatal: unexpected EOF\t\t(Normally works ok)\nFailed to find remote refs\nunable to get tags list (non-fatal)\nUp to date.\ngit checkout -f suspend2-2.6.19\nstg pull linux-2.6.19.x-local\nPopping all applied patches... done\nPulling from \"linux-2.6.19.x-local\"...\nAlready up-to-date.\ndone\nFast-forwarded patch \"suspend2.patch\"\nNow at patch \"suspend2.patch\"\n\nOk, so I fix any rejects, complile, test and all is happy with the\nworld.\n\nnigel@nigel:/usr/src/stg-tree$ cat .git/remotes/linux-2.6.19.x \nURL: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.19.y.git\nPull: refs/heads/linux-2.6.19.x:refs/heads/origin\n\nMy problem, however, comes when I try to upload to master.kernel.org.\nAll seems to go okay, until it pulls the tags. Then it starts trying to\npull tags and commits not just from the particular branch, but from the\nwhole tree:\nDir is suspend2-2.6.19\nOrigin is origin\nTree is suspend2-2.6.19\nRemote is linux-2.6.19.x\n\ncd /staging/nigelc\ncp -ar suspend2-2.6.19.git /staging/nigelc\ncd /staging/nigelc\nexport GIT_DIR=suspend2-2.6.19.git\ngit checkout -f origin\ncg fetch\nFetching pack (head and objects)...\nFetching tags...\nUp to date.\ngit branch -D suspend2-2.6.19\nDeleted branch suspend2-2.6.19.\ngit branch suspend2-2.6.19\ngit checkout -f suspend2-2.6.19\ncg fetch suspend2-2.6.19\nFetching pack (head and objects)...\nremote: Generating pack...\nremote: Done counting 234 objects.\nremote: Deltifying 234 objects.\nremote:  100% (234/234) done\nUnpacking 234 objects\nremote: Total 234, written 234 (delta 5), reused 27 (delta 2)\nFetching tags...\nMissing tag v2.6.20...\nMissing tag v2.6.20...\nMissing tag v2.6.20-rc1...\nMissing tag v2.6.20-rc1...\nMissing tag v2.6.20-rc2...\nMissing tag v2.6.20-rc2...\nMissing tag v2.6.20-rc3...\nMissing tag v2.6.20-rc3...\nMissing tag v2.6.20-rc4...\nMissing tag v2.6.20-rc4...\nMissing tag v2.6.20-rc5...\nMissing tag v2.6.20-rc5...\nMissing tag v2.6.20-rc6...\nMissing tag v2.6.20-rc6...\nMissing tag v2.6.20-rc7...\nMissing tag v2.6.20-rc7...\nremote: Generating pack...\nremote: Done counting 40070 objects.\nremote: Deltifying 40070 objects.\nKilled by signal 2.0/40070) done\n\nAs you can see, at the end, it starts pulling tags and commits from\noutside my local suspend2-2.6.19.\n\n[nigelc@hera nigelc]$ cat suspend2-2.6.19.git/branches/origin \ngit://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.19.y.git\n[nigelc@hera nigelc]$ cat suspend2-2.6.19.git/branches/suspend2-2.6.19 \ngit+ssh://nigel@nigel.suspend2.net/usr/src/stg-tree/.git/#suspend2-2.6.19\n[nigelc@hera nigelc]$ cat suspend2-2.6.19.git/remotes/origin \nURL: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.19.y.git\nPull: refs/heads/master:refs/heads/origin\n[nigelc@hera nigelc]$ cat suspend2-2.6.19.git/remotes/suspend2-2.6.19 \nURL: git+ssh://nigel@nigel.suspend2.net/usr/src/stg-tree/.git\nPull: refs/heads/suspend2-2.6.19:refs/heads/suspend2-2.6.19\n\nWhat am I doing wrong?\n\nTIA!\n\nNigel\n"}]}