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
58
59
60
|
#!/bin/sh
test_description='Run "stg squash"'
. ./test-lib.sh
test_expect_success 'Initialize StGit stack' '
stg init &&
for i in 0 1 2 3; do
stg new p$i -m "foo $i" &&
echo "foo $i" >> foo.txt &&
stg add foo.txt &&
stg refresh
done
'
test_expect_success 'Too few arguments' '
command_error stg squash p0 2>&1 |
grep -e "Need at least two patches"
'
test_expect_success 'Attempt duplicate patch name' '
command_error stg squash -n p3 -- p0 p1 2>&1 |
grep -e "Patch name \"p3\" already taken"
'
test_expect_success 'Save template' '
stg squash --save-template mytemplate p0 p1 &&
test -e mytemplate &&
[ "$(echo $(stg series --applied --noprefix))" = "p0 p1 p2 p3" ]
'
test_expect_success 'Squash some patches' '
[ "$(echo $(stg series --applied --noprefix))" = "p0 p1 p2 p3" ] &&
[ "$(echo $(stg series --unapplied --noprefix))" = "" ] &&
stg squash --name=q0 --message="wee woo" p1 p2 &&
[ "$(echo $(stg series --applied --noprefix))" = "p0 q0 p3" ] &&
[ "$(echo $(stg series --unapplied --noprefix))" = "" ]
'
test_expect_success 'Squash at stack top' '
stg squash --name=q1 --message="wee woo wham" q0 p3 &&
[ "$(echo $(stg series --applied --noprefix))" = "p0 q1" ] &&
[ "$(echo $(stg series --unapplied --noprefix))" = "" ]
'
cat > editor <<EOF
#!/bin/sh
echo "Editor was invoked" | tee editor-invoked
EOF
chmod a+x editor
test_expect_success 'Squash with top != head' '
echo blahonga >> foo.txt &&
git commit -a -m "a new commit" &&
EDITOR=./editor command_error stg squash --name=r0 p0 q1 &&
test "$(echo $(stg series))" = "+ p0 > q1" &&
test ! -e editor-invoked
'
test_done
|
