Keep track of safe base changes.

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

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index c2c99e2640bd05a5f0b337bca7dc4923d056b11d..2ef845421c8edc6cd7478b56f1a004c2c2752147 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -367,6 +367,8 @@ def rebase(target):
     git.reset(tree_id = git_id(target))
 
 def post_rebase(applied, nopush, merged):
     git.reset(tree_id = git_id(target))
 
 def post_rebase(applied, nopush, merged):

+    # memorize that we rebased to here
+    crt_series._set_field('orig-base', git.get_head())

     # push the patches back
     if not nopush:
         push_patches(applied, merged)
     # push the patches back
     if not nopush:
         push_patches(applied, merged)

diff --git a/stgit/stack.py b/stgit/stack.py
index 3185d6450b933aef277d8b86c9156433941978e3..0f5d868d07e0b5b0d78901a52428d300644a4e1a 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -540,6 +540,7 @@ class Series(StgitObject):
         os.makedirs(os.path.join(self._dir(), 'patches'))
         os.makedirs(self.__refs_dir)
         self.__begin_stack_check()
         os.makedirs(os.path.join(self._dir(), 'patches'))
         os.makedirs(self.__refs_dir)
         self.__begin_stack_check()

+        self._set_field('orig-base', git.get_head())

 
     def convert(self):
         """Either convert to use a separate patch directory, or
 
     def convert(self):
         """Either convert to use a separate patch directory, or