Modify the assertion in Series.new_patch

The bottom == head assertion is wrong when the patch is created as
unapplied.

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

diff --git a/stgit/stack.py b/stgit/stack.py
index 7ffaf758ef6080c452143085f2f1194d5c6db508..dbd7ea43adfc2bd91769e1e4d57a0a2fb12759d3 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
         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,
             top_commit = git.get_commit(top)
             commit_id = git.commit(message = descr, parents = [bottom],
                                    cache_update = False,