Modify the assertion in Series.new_patch

[stgit] / stgit / stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index 7ffaf75..dbd7ea4 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -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,