freshlybakedca.ke
Git fork
t/lib-read-tree-m-3way: modernize style
Many invocations of the test_expect_success command in this
file are written in old style where the command, an optional
prerequisite, and the test title are written on separate
lines, and the executable script string begins on its own
line, and these lines are pasted together with backslashes
as necessary.
An invocation of the test_expect_success command in modern
test scripts however writes the prerequisite and the title
on the same line as the test_expect_success command itself,
and ends the line with a single quote that begins the
executable script string.
Update the style for uniformity.
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
authored by
Shaoxuan Yuan
and committed by
Junio C Hamano
ddea5719
4c53a8c2
+75
-75
t/lib-read-tree-m-3way.sh
+75
-75
t/lib-read-tree-m-3way.sh
···
8
8
p=$a$b
9
9
echo This is $p from the original tree. >$p
10
10
echo This is Z/$p from the original tree. >Z/$p
11
-
test_expect_success \
12
-
"adding test file $p and Z/$p" \
13
-
'git update-index --add $p &&
14
-
git update-index --add Z/$p'
11
+
test_expect_success "adding test file $p and Z/$p" '
12
+
git update-index --add $p &&
13
+
git update-index --add Z/$p
14
+
'
15
15
done
16
16
done
17
17
echo This is SS from the original tree. >SS
18
-
test_expect_success \
19
-
'adding test file SS' \
20
-
'git update-index --add SS'
18
+
test_expect_success 'adding test file SS' '
19
+
git update-index --add SS
20
+
'
21
21
cat >TT <<\EOF
22
22
This is a trivial merge sample text.
23
23
Branch A is expected to upcase this word, here.
···
30
30
the word, expected to be upcased by Branch B.
31
31
This concludes the trivial merge sample file.
32
32
EOF
33
-
test_expect_success \
34
-
'adding test file TT' \
35
-
'git update-index --add TT'
36
-
test_expect_success \
37
-
'prepare initial tree' \
38
-
'tree_O=$(git write-tree)'
33
+
test_expect_success 'adding test file TT' '
34
+
git update-index --add TT
35
+
'
36
+
test_expect_success 'prepare initial tree' '
37
+
tree_O=$(git write-tree)
38
+
'
39
39
40
40
################################################################
41
41
# Branch A and B makes the changes according to the above matrix.
···
45
45
46
46
to_remove=$(echo D? Z/D?)
47
47
rm -f $to_remove
48
-
test_expect_success \
49
-
'change in branch A (removal)' \
50
-
'git update-index --remove $to_remove'
48
+
test_expect_success 'change in branch A (removal)' '
49
+
git update-index --remove $to_remove
50
+
'
51
51
52
52
for p in M? Z/M?
53
53
do
54
54
echo This is modified $p in the branch A. >$p
55
-
test_expect_success \
56
-
'change in branch A (modification)' \
57
-
"git update-index $p"
55
+
test_expect_success 'change in branch A (modification)' '
56
+
git update-index $p
57
+
'
58
58
done
59
59
60
60
for p in AN AA Z/AN Z/AA
61
61
do
62
62
echo This is added $p in the branch A. >$p
63
-
test_expect_success \
64
-
'change in branch A (addition)' \
65
-
"git update-index --add $p"
63
+
test_expect_success 'change in branch A (addition)' '
64
+
git update-index --add $p
65
+
'
66
66
done
67
67
68
68
echo This is SS from the modified tree. >SS
69
69
echo This is LL from the modified tree. >LL
70
-
test_expect_success \
71
-
'change in branch A (addition)' \
72
-
'git update-index --add LL &&
73
-
git update-index SS'
70
+
test_expect_success 'change in branch A (addition)' '
71
+
git update-index --add LL &&
72
+
git update-index SS
73
+
'
74
74
mv TT TT-
75
75
sed -e '/Branch A/s/word/WORD/g' <TT- >TT
76
76
rm -f TT-
77
-
test_expect_success \
78
-
'change in branch A (edit)' \
79
-
'git update-index TT'
77
+
test_expect_success 'change in branch A (edit)' '
78
+
git update-index TT
79
+
'
80
80
81
81
mkdir DF
82
82
echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF
83
-
test_expect_success \
84
-
'change in branch A (change file to directory)' \
85
-
'git update-index --add DF/DF'
83
+
test_expect_success 'change in branch A (change file to directory)' '
84
+
git update-index --add DF/DF
85
+
'
86
86
87
-
test_expect_success \
88
-
'recording branch A tree' \
89
-
'tree_A=$(git write-tree)'
87
+
test_expect_success 'recording branch A tree' '
88
+
tree_A=$(git write-tree)
89
+
'
90
90
91
91
################################################################
92
92
# Branch B
···
94
94
95
95
rm -rf [NDMASLT][NDMASLT] Z DF
96
96
mkdir Z
97
-
test_expect_success \
98
-
'reading original tree and checking out' \
99
-
'git read-tree $tree_O &&
100
-
git checkout-index -a'
97
+
test_expect_success 'reading original tree and checking out' '
98
+
git read-tree $tree_O &&
99
+
git checkout-index -a
100
+
'
101
101
102
102
to_remove=$(echo ?D Z/?D)
103
103
rm -f $to_remove
104
-
test_expect_success \
105
-
'change in branch B (removal)' \
106
-
"git update-index --remove $to_remove"
104
+
test_expect_success 'change in branch B (removal)' '
105
+
git update-index --remove $to_remove
106
+
'
107
107
108
108
for p in ?M Z/?M
109
109
do
110
110
echo This is modified $p in the branch B. >$p
111
-
test_expect_success \
112
-
'change in branch B (modification)' \
113
-
"git update-index $p"
111
+
test_expect_success 'change in branch B (modification)' '
112
+
git update-index $p
113
+
'
114
114
done
115
115
116
116
for p in NA AA Z/NA Z/AA
117
117
do
118
118
echo This is added $p in the branch B. >$p
119
-
test_expect_success \
120
-
'change in branch B (addition)' \
121
-
"git update-index --add $p"
119
+
test_expect_success 'change in branch B (addition)' '
120
+
git update-index --add $p
121
+
'
122
122
done
123
123
echo This is SS from the modified tree. >SS
124
124
echo This is LL from the modified tree. >LL
125
-
test_expect_success \
126
-
'change in branch B (addition and modification)' \
127
-
'git update-index --add LL &&
128
-
git update-index SS'
125
+
test_expect_success 'change in branch B (addition and modification)' '
126
+
git update-index --add LL &&
127
+
git update-index SS
128
+
'
129
129
mv TT TT-
130
130
sed -e '/Branch B/s/word/WORD/g' <TT- >TT
131
131
rm -f TT-
132
-
test_expect_success \
133
-
'change in branch B (modification)' \
134
-
'git update-index TT'
132
+
test_expect_success 'change in branch B (modification)' '
133
+
git update-index TT
134
+
'
135
135
136
136
echo Branch B makes a file at DF. >DF
137
-
test_expect_success \
138
-
'change in branch B (addition of a file to conflict with directory)' \
139
-
'git update-index --add DF'
137
+
test_expect_success 'change in branch B (addition of a file to conflict with directory)' '
138
+
git update-index --add DF
139
+
'
140
140
141
-
test_expect_success \
142
-
'recording branch B tree' \
143
-
'tree_B=$(git write-tree)'
141
+
test_expect_success 'recording branch B tree' '
142
+
tree_B=$(git write-tree)
143
+
'
144
144
145
-
test_expect_success \
146
-
'keep contents of 3 trees for easy access' \
147
-
'rm -f .git/index &&
148
-
git read-tree $tree_O &&
149
-
mkdir .orig-O &&
150
-
git checkout-index --prefix=.orig-O/ -f -q -a &&
151
-
rm -f .git/index &&
152
-
git read-tree $tree_A &&
153
-
mkdir .orig-A &&
154
-
git checkout-index --prefix=.orig-A/ -f -q -a &&
155
-
rm -f .git/index &&
156
-
git read-tree $tree_B &&
157
-
mkdir .orig-B &&
158
-
git checkout-index --prefix=.orig-B/ -f -q -a'
145
+
test_expect_success 'keep contents of 3 trees for easy access' '
146
+
rm -f .git/index &&
147
+
git read-tree $tree_O &&
148
+
mkdir .orig-O &&
149
+
git checkout-index --prefix=.orig-O/ -f -q -a &&
150
+
rm -f .git/index &&
151
+
git read-tree $tree_A &&
152
+
mkdir .orig-A &&
153
+
git checkout-index --prefix=.orig-A/ -f -q -a &&
154
+
rm -f .git/index &&
155
+
git read-tree $tree_B &&
156
+
mkdir .orig-B &&
157
+
git checkout-index --prefix=.orig-B/ -f -q -a
158
+
'