Merge branch 'stable' into stable-master-merge

[stgit] / t / t1300-uncommit.sh

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