X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/677202284a6742d68c05622161ad10689c4ff4a4..1981b663ae51262a82481ecd91b89ab897919c63:/stgit/stack.py?ds=sidebyside 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)