{"thread":{"id":"2441","subject":"GIT maintenance on ia64 test tree","startedAt":"2005-11-11T00:59:31Z","lastAt":"2005-11-11T00:59:31Z","messageCount":1,"participants":["Luck, Tony"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"11537","messageId":"B8E391BBE9FE384DAA4C5C003888BE6F04EE77E4@scsmsx401.amr.corp.intel.com","threadId":"2441","inReplyTo":null,"subject":"GIT maintenance on ia64 test tree","fromName":"Luck, Tony","fromEmail":"tony.luck@intel.com","sentAt":"2005-11-11T00:59:31Z","receivedAt":"2005-11-11T00:59:31Z","isPatch":false,"sender":{"key":"tony.luck@intel.com","avatar":"https://avatars.githubusercontent.com/u/5446021?v=4"},"body":"The way that I'm using GIT to maintain my test/release\ntrees results in the test tree building a history of\nextra fluff (lots of auto-updates from Linus, plus all\nthe merge-commits to bring in each of the patch-sets, plus\nsome mistakes from when I goofed with GIT).\n\nSo, I'm going to periodically blow away the test branch\nand re-create a clean version.  This mail is advance\nnotice that I'm going to do this when Linus releases\n2.6.15-rc1 (a convenient point since I just sent everything\nthat was cooking in test to Linus ... so the test tree is\ncurrently empty).\n\nWhat this means is that the new \"test\" branch won't have\nany connection to the old \"test\" branch.  So a \"git pull\"\nor \"git fetch\" will fail.  To fix this in native git I *think*\nyou need to run (git list copied in the hope that if this is\ntragically wrong, or overly complex, someone will take pity\nand explain how it should be done):\n\n $ git checkout\n{any-branch-other-than-the-one-you-track-my-test-tree-with}\n $ git branch -D test\n $ git branch test v2.6.15-rc1\n\nNote that this will orphan all the objects relating to the\nhistory of the test branch.  You can clean up with:\n\n $ git prune\n\nBUT, this will also throw away any other orphaned stuff too, so\nonly do this if you are ok with ditching this.  You could run\n\n $ git fsck-objects\n\nbefore any of the above to see whether you have any orphans.\n\nCogito users ... I have no idea.  First one to figure it out\nplease post a recipe.\n\n-Tony\n"}]}