1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
#!/bin/sh
test_description='Simple test cases for "stg undo"'
. ./test-lib.sh
# Ignore our own output files.
cat >> .git/info/exclude <<EOF
/expected.txt
/actual.txt
EOF
test_expect_success 'Initialize StGit stack with three patches' '
stg init &&
echo 000 >> a &&
stg add a &&
git commit -m a &&
echo 111 >> a &&
git commit -a -m p1 &&
echo 222 >> a &&
git commit -a -m p2 &&
echo 333 >> a &&
git commit -a -m p3 &&
stg uncommit -n 3 &&
test "$(stg id)" = "$(stg id $(stg top))"
'
cat > expected.txt <<EOF
UU a
EOF
test_expect_success 'Pop middle patch, creating a conflict' '
conflict stg pop p2 &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
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 "$(stg id)" = "$(stg id $(stg top))"
'
cat > expected.txt <<EOF
EOF
test_expect_success 'Try to undo with --hard' '
stg undo --hard &&
stg status a > actual.txt &&
test_cmp expected.txt actual.txt &&
test "$(echo $(stg series))" = "+ p1 + p2 > p3" &&
test "$(stg id)" = "$(stg id $(stg top))"
'
test_done
|
