Cleanup parent information on stgit branch deletion.

Signed-off-by: Yann Dirson <ydirson@altern.org>

diff --git a/stgit/stack.py b/stgit/stack.py
index f188db4083da7301090b3d0e0fac48e6b05254c3..a726cb5ec8287688d704957f39495680e035773d 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -702,6 +702,13 @@ class Series(StgitObject):
             remove_file_and_dirs(
                 os.path.join(self.__base_dir, 'refs', 'bases'), self.__name)
 
             remove_file_and_dirs(
                 os.path.join(self.__base_dir, 'refs', 'bases'), self.__name)
 

+        # Cleanup parent informations
+        # FIXME: should one day make use of git-config --section-remove,
+        # scheduled for 1.5.1
+        config.unset('branch.%s.remote' % self.__name)
+        config.unset('branch.%s.merge' % self.__name)
+        config.unset('branch.%s.stgit.parentbranch' % self.__name)
+

     def refresh_patch(self, files = None, message = None, edit = False,
                       show_patch = False,
                       cache_update = True,
     def refresh_patch(self, files = None, message = None, edit = False,
                       show_patch = False,
                       cache_update = True,