From 1981b663ae51262a82481ecd91b89ab897919c63 Mon Sep 17 00:00:00 2001 Message-Id: <1981b663ae51262a82481ecd91b89ab897919c63.1715157231.git.mdw@distorted.org.uk> From: Mark Wooding Date: Wed, 17 Oct 2007 21:35:01 +0100 Subject: [PATCH] Fix assertion in patch creation Organization: Straylight/Edgeware From: Catalin Marinas 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 --- stgit/stack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) -- [mdw]