From 501d024430ebad7e010362cc60f73713da6e787e Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 18 Jul 2007 00:01:22 +0100 Subject: [PATCH] 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 --- stgit/stack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stgit/stack.py b/stgit/stack.py index 7ffaf75..dbd7ea4 100644 --- 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, -- 2.11.0