t1002: modernize outdated conditional
Tests in this script use an unusual and hard to reason about conditional construct if expression; then false; else :; fi Change them to use more idiomatic construct: ! expression Cc: Christian Couder <christian.couder@gmail.com> Cc: Hariom Verma <hariom18599@gmail.com> Signed-off-by: Nsengiyumva Wilberforce <nsengiyumvawilberforce@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nsengiyumva Wilberforce committed
Oct 14, 2022 at 08:01 UTC
8d2863e4ed7f35baeb2604ee8ed39fe6aa5e62c7
1 file changed
+8
-8
t/t1002-read-tree-m-u-2way.sh
+8
-8
@@ -154,7 +154,7 @@ test_expect_success \
154
read_tree_u_must_succeed --reset -u $treeH &&
155
echo frotz frotz >frotz &&
156
git update-index --add frotz &&
157
- if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi'
157
+ ! read_tree_u_must_succeed -m -u $treeH $treeM'
158
159
test_expect_success \
160
'9 - conflicting addition.' \
@@ -163,7 +163,7 @@ test_expect_success \
163
echo frotz frotz >frotz &&
164
git update-index --add frotz &&
165
echo frotz >frotz &&
166
- if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi'
166
+ ! read_tree_u_must_succeed -m -u $treeH $treeM'
167
168
test_expect_success \
169
'10 - path removed.' \
@@ -186,7 +186,7 @@ test_expect_success \
186
echo rezrov >rezrov &&
187
git update-index --add rezrov &&
188
echo rezrov rezrov >rezrov &&
189
- if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi'
189
+ ! read_tree_u_must_succeed -m -u $treeH $treeM'
190
191
test_expect_success \
192
'12 - unmatching local changes being removed.' \
@@ -194,7 +194,7 @@ test_expect_success \
194
read_tree_u_must_succeed --reset -u $treeH &&
195
echo rezrov rezrov >rezrov &&
196
git update-index --add rezrov &&
197
- if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi'
197
+ ! read_tree_u_must_succeed -m -u $treeH $treeM'
198
199
test_expect_success \
200
'13 - unmatching local changes being removed.' \
@@ -203,7 +203,7 @@ test_expect_success \
203
echo rezrov rezrov >rezrov &&
204
git update-index --add rezrov &&
205
echo rezrov >rezrov &&
206
- if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi'
206
+ ! read_tree_u_must_succeed -m -u $treeH $treeM'
207
208
cat >expected <<EOF
209
-100644 X 0 nitfol
@@ -251,7 +251,7 @@ test_expect_success \
251
read_tree_u_must_succeed --reset -u $treeH &&
252
echo bozbar bozbar >bozbar &&
253
git update-index --add bozbar &&
254
- if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi'
254
+ ! read_tree_u_must_succeed -m -u $treeH $treeM'
255
256
test_expect_success \
257
'17 - conflicting local change.' \
@@ -260,7 +260,7 @@ test_expect_success \
260
echo bozbar bozbar >bozbar &&
261
git update-index --add bozbar &&
262
echo bozbar bozbar bozbar >bozbar &&
263
- if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi'
263
+ ! read_tree_u_must_succeed -m -u $treeH $treeM'
264
265
test_expect_success \
266
'18 - local change already having a good result.' \
@@ -316,7 +316,7 @@ test_expect_success \
316
echo bozbar >bozbar &&
317
git update-index --add bozbar &&
318
echo gnusto gnusto >bozbar &&
319
- if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi'
319
+ ! read_tree_u_must_succeed -m -u $treeH $treeM'
320
321
# Also make sure we did not break DF vs DF/DF case.
322
test_expect_success \