{"thread":{"id":"10703","subject":"stgit: cleaning up after using git branch delete commands","startedAt":"2007-11-07T14:06:44Z","lastAt":"2007-11-08T09:18:35Z","messageCount":5,"participants":["Jon Smirl","Catalin Marinas","Karl Hasselström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"58671","messageId":"9e4733910711070606t2c558ac9ob4c729d5baca8fb9@mail.gmail.com","threadId":"10703","inReplyTo":null,"subject":"stgit: cleaning up after using git branch delete commands","fromName":"Jon Smirl","fromEmail":"jonsmirl@gmail.com","sentAt":"2007-11-07T14:06:44Z","receivedAt":"2007-11-07T14:06:44Z","isPatch":false,"sender":{"key":"jonsmirl@gmail.com","avatar":"https://gravatar.com/avatar/cff3bf5bfdfa6708b905712ff91f0f9b8aaca161659f38c02b787920d5d28b7e?d=mp&s=160"},"body":"I've used git commands to delete several branches that had stgit\nactive on it.  Doing that has left a bunch of clutter in the .git\ndirectory. Is there a stgit command to remove all the clutter from\nbranches that no longer exist? I'd like to use the branch names again\nbut the clutter is interfering.\n\n-- \nJon Smirl\njonsmirl@gmail.com\n"},{"id":"58678","messageId":"tnxwssuyug1.fsf@pc1117.cambridge.arm.com","threadId":"10703","inReplyTo":"9e4733910711070606t2c558ac9ob4c729d5baca8fb9@mail.gmail.com","subject":"Re: stgit: cleaning up after using git branch delete commands","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@arm.com","sentAt":"2007-11-07T14:57:34Z","receivedAt":"2007-11-07T14:57:34Z","isPatch":false,"sender":{"key":"catalin.marinas@arm.com","avatar":null},"body":"\"Jon Smirl\" <jonsmirl@gmail.com> wrote:\n> I've used git commands to delete several branches that had stgit\n> active on it.  Doing that has left a bunch of clutter in the .git\n> directory. Is there a stgit command to remove all the clutter from\n> branches that no longer exist? I'd like to use the branch names again\n> but the clutter is interfering.\n\nYou can create the branch back with GIT and run \"stg branch --delete\n--force\", though I don't guarantee it will work (BTW, I only recently\nrelaxed the branch deletion rules in StGIT so that it doesn't complain\nof missing files and completes the operation, so you should use the\nlatest HEAD).\n\n-- \nCatalin\n"},{"id":"58696","messageId":"9e4733910711070811y72f96a90i4db9acdf93aa765c@mail.gmail.com","threadId":"10703","inReplyTo":"tnxwssuyug1.fsf@pc1117.cambridge.arm.com","subject":"Re: stgit: cleaning up after using git branch delete commands","fromName":"Jon Smirl","fromEmail":"jonsmirl@gmail.com","sentAt":"2007-11-07T16:11:42Z","receivedAt":"2007-11-07T16:11:42Z","isPatch":false,"sender":{"key":"jonsmirl@gmail.com","avatar":"https://gravatar.com/avatar/cff3bf5bfdfa6708b905712ff91f0f9b8aaca161659f38c02b787920d5d28b7e?d=mp&s=160"},"body":"On 11/7/07, Catalin Marinas <catalin.marinas@arm.com> wrote:\n> \"Jon Smirl\" <jonsmirl@gmail.com> wrote:\n> > I've used git commands to delete several branches that had stgit\n> > active on it.  Doing that has left a bunch of clutter in the .git\n> > directory. Is there a stgit command to remove all the clutter from\n> > branches that no longer exist? I'd like to use the branch names again\n> > but the clutter is interfering.\n>\n> You can create the branch back with GIT and run \"stg branch --delete\n> --force\", though I don't guarantee it will work (BTW, I only recently\n> relaxed the branch deletion rules in StGIT so that it doesn't complain\n> of missing files and completes the operation, so you should use the\n> latest HEAD).\n\nhow about a 'stg gc' command that gets rid of all the inaccessible clutter?\n\n\n>\n> --\n> Catalin\n>\n\n\n-- \nJon Smirl\njonsmirl@gmail.com\n"},{"id":"58799","messageId":"20071108055302.GA11230@diana.vm.bytemark.co.uk","threadId":"10703","inReplyTo":"9e4733910711070811y72f96a90i4db9acdf93aa765c@mail.gmail.com","subject":"Re: stgit: cleaning up after using git branch delete commands","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-11-08T05:53:02Z","receivedAt":"2007-11-08T05:53:02Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-11-07 11:11:42 -0500, Jon Smirl wrote:\n\n> how about a 'stg gc' command that gets rid of all the inaccessible\n> clutter?\n\n\"stg assimilate\" already has the job of fixing up stuff after the user\nhas used git commands to move HEAD around. I think it would make sense\nto teach it to do this too -- and then rename it \"stg repair\" or\nsomething. That way, there's one command to fix every kind of \"damage\"\nthat git can do to stgit.\n\nAlternatively, \"stg branch --create\" and \"stg init\" and whoever else\nis bothered by the clutter could simply remove it themselves. That\nwould be even more user-friendly, I guess.\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"58837","messageId":"b0943d9e0711080118q47441844hc25758f733e9af65@mail.gmail.com","threadId":"10703","inReplyTo":"20071108055302.GA11230@diana.vm.bytemark.co.uk","subject":"Re: stgit: cleaning up after using git branch delete commands","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2007-11-08T09:18:35Z","receivedAt":"2007-11-08T09:18:35Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 08/11/2007, Karl Hasselström <kha@treskal.com> wrote:\n> On 2007-11-07 11:11:42 -0500, Jon Smirl wrote:\n>\n> > how about a 'stg gc' command that gets rid of all the inaccessible\n> > clutter?\n>\n> \"stg assimilate\" already has the job of fixing up stuff after the user\n> has used git commands to move HEAD around. I think it would make sense\n> to teach it to do this too -- and then rename it \"stg repair\" or\n> something. That way, there's one command to fix every kind of \"damage\"\n> that git can do to stgit.\n\n\"repair\" sounds better than \"gc\" (which might also be confused with\nthe \"git gc\" command).\n\n> Alternatively, \"stg branch --create\" and \"stg init\" and whoever else\n> is bothered by the clutter could simply remove it themselves. That\n> would be even more user-friendly, I guess.\n\nI did some fixes for branch --delete but, since I use StGIT almost\nexclusively, haven't thought that we need to relax the branch creation\nas well.\n\n-- \nCatalin\n"}]}