From: Yann Dirson <ydirson@altern.org>
Date: Tue, 20 Feb 2007 00:14:19 +0000 (+0100)
Subject: Keep track of safe base changes.
X-Git-Tag: v0.12.1~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/b6c95ada87ed57ef78f4a02987606e498cd4e04d?ds=inline

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 c2c99e2..2ef8454 100644
--- 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):
+    # 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)
diff --git a/stgit/stack.py b/stgit/stack.py
index 3185d64..0f5d868 100644
--- 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()
+        self._set_field('orig-base', git.get_head())
 
     def convert(self):
         """Either convert to use a separate patch directory, or