Update .git/refs/heads/base after patch deletion

Save the current HEAD into refs/heads/base if the stack is empty after
a patch has been deleted. This was not done before, which caused
refs/heads/base to not be updated after 'stg commit'. To guard against
existing repositories with no applied patches and HEAD !=
refs/heads/base, also do the update every time someone asks for the
name of refs/heads/base.

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

diff --git a/stgit/stack.py b/stgit/stack.py
index 556c40ec35d2fe1aa5a7529e78bffbd8f0130813..9ccbb1eaeb62b1d7e5923c5afbb4186500aaed46 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -366,6 +366,7 @@ class Series:
         return names
 
     def get_base_file(self):
         return names
 
     def get_base_file(self):

+        self.__begin_stack_check()

         return self.__base_file
 
     def get_protected(self):
         return self.__base_file
 
     def get_protected(self):


@@ -694,6 +695,7 @@ class Series:
         f = file(self.__unapplied_file, 'w+')
         f.writelines([line + '\n' for line in unapplied])
         f.close()
         f = file(self.__unapplied_file, 'w+')
         f.writelines([line + '\n' for line in unapplied])
         f.close()

+        self.__begin_stack_check()

 
     def forward_patches(self, names):
         """Try to fast-forward an array of patches.
 
     def forward_patches(self, names):
         """Try to fast-forward an array of patches.