From: Karl Hasselström <kha@treskal.com>
Date: Tue, 15 May 2007 19:38:40 +0000 (+0200)
Subject: Remove obsolete files when deleting a branch
X-Git-Tag: v0.13~71
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/e46f1350a9284095b239ce3568a2fe61149c7391

Remove obsolete files when deleting a branch

Signed-off-by: Karl Hasselström <kha@treskal.com>
---

diff --git a/stgit/stack.py b/stgit/stack.py
index 5e8d2d7..d9c4b99 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -666,6 +666,15 @@ class Series(StgitObject):
             if os.path.exists(self._dir()+'/orig-base'):
                 os.remove(self._dir()+'/orig-base')
 
+            # Remove obsolete files that StGIT no longer uses, but
+            # that might still be around if this is an old repository.
+            for obsolete in ([os.path.join(self._dir(), fn)
+                              for fn in ['current', 'description']]
+                             + [os.path.join(self.__base_dir,
+                                             'refs', 'bases', self.__name)]):
+                if os.path.exists(obsolete):
+                    os.remove(obsolete)
+
             if not os.listdir(self.__patch_dir):
                 os.rmdir(self.__patch_dir)
             else: