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@xxxxxxxxx>. Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx> --- t/t1300-uncommit.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html