From: Karl Hasselström <kha@treskal.com>
Date: Thu, 20 Mar 2008 23:12:10 +0000 (+0000)
Subject: Try uncommitting a commit with not exactly one parent
X-Git-Tag: v0.15-rc1~267
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/b9d9ba14bf9fc47ab1ae9c41e6e37029b9f31002

Try uncommitting a commit with not exactly one parent

This should fail cleanly -- and in fact it does. Except for printing
an assertion backtrace instead of a nice error message. (This is a
regression introduced by the conversion of "stg uncommit" to the new
infrastructure.)

Found by Erik Sandberg <mandolaerik@gmail.com>.

Signed-off-by: Karl Hasselström <kha@treskal.com>
---

diff --git a/t/t1300-uncommit.sh b/t/t1300-uncommit.sh
index d86e579..0d952a7 100755
--- a/t/t1300-uncommit.sh
+++ b/t/t1300-uncommit.sh
@@ -78,4 +78,9 @@ test_expect_success \
     stg commit --all
 '
 
+test_expect_failure 'Uncommit a commit with not precisely one parent' '
+    stg uncommit -n 5 ; [ $? = 2 ] &&
+    [ "$(echo $(stg series))" = "" ]
+'
+
 test_done