Modify the assertion in Series.new_patch
authorCatalin Marinas <catalin.marinas@gmail.com>
Tue, 17 Jul 2007 23:01:22 +0000 (00:01 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Tue, 17 Jul 2007 23:01:22 +0000 (00:01 +0100)
The bottom == head assertion is wrong when the patch is created as
unapplied.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/stack.py

index 7ffaf75..dbd7ea4 100644 (file)
@@ -881,7 +881,7 @@ class Series(PatchSet):
         if commit:
             # create a commit for the patch (may be empty if top == bottom);
             # only commit on top of the current branch
-            assert(commit and bottom == head)
+            assert(unapplied or bottom == head)
             top_commit = git.get_commit(top)
             commit_id = git.commit(message = descr, parents = [bottom],
                                    cache_update = False,