git commit -a -m p2 &&
echo 333 >> a &&
git commit -a -m p3 &&
- stg uncommit -n 3
+ stg uncommit -n 3 &&
+ test "$(stg id)" = "$(stg id $(stg top))"
'
cat > expected.txt <<EOF
conflict stg pop p2 &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
- test "$(echo $(stg series))" = "+ p1 > p3 - p2"
+ test "$(echo $(stg series))" = "+ p1 > p3 - p2" &&
+ test "$(stg id)" = "$(stg id $(stg top))"
'
test_expect_success 'Try to undo without --hard' '
command_error stg undo &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
- test "$(echo $(stg series))" = "+ p1 > p3 - p2"
+ test "$(echo $(stg series))" = "+ p1 > p3 - p2" &&
+ test "$(stg id)" = "$(stg id $(stg top))"
'
cat > expected.txt <<EOF
stg undo --hard &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
- test "$(echo $(stg series))" = "> p1 - p2 - p3"
+ test "$(echo $(stg series))" = "+ p1 + p2 > p3" &&
+ test "$(stg id)" = "$(stg id $(stg top))"
'
test_done