From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 17 Oct 2007 20:35:01 +0000 (+0100)
Subject: Fix assertion in patch creation
X-Git-Tag: v0.14.3~72
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/1981b663ae51262a82481ecd91b89ab897919c63?hp=677202284a6742d68c05622161ad10689c4ff4a4

Fix assertion in patch creation

Top and bottom can be unrelated if the "commit" argument is true since
new_patch will generate a new commit object anyway. Fix the
corresponding assert.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---

diff --git a/stgit/stack.py b/stgit/stack.py
index 94856b8..f2b2afb 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -145,7 +145,7 @@ class StgitObject:
         elif os.path.isfile(fname):
             os.remove(fname)
 
-    
+
 class Patch(StgitObject):
     """Basic patch implementation
     """
@@ -856,7 +856,7 @@ class Series(PatchSet):
         assert not before_existing or (top and bottom)
         assert not (commit and before_existing)
         assert (top and bottom) or (not top and not bottom)
-        assert not top or (bottom == git.get_commit(top).get_parent())
+        assert commit or (not top or (bottom == git.get_commit(top).get_parent()))
 
         if name != None:
             self.__patch_name_valid(name)