Skip to content

Commit 8d2863e

Browse files
nsengiyumva-wilberforcegitster
authored andcommitted
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 <[email protected]> Cc: Hariom Verma <[email protected]> Signed-off-by: Nsengiyumva Wilberforce <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3dcec76 commit 8d2863e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

t/t1002-read-tree-m-u-2way.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ test_expect_success \
154154
read_tree_u_must_succeed --reset -u $treeH &&
155155
echo frotz frotz >frotz &&
156156
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'
158158

159159
test_expect_success \
160160
'9 - conflicting addition.' \
@@ -163,7 +163,7 @@ test_expect_success \
163163
echo frotz frotz >frotz &&
164164
git update-index --add frotz &&
165165
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'
167167

168168
test_expect_success \
169169
'10 - path removed.' \
@@ -186,15 +186,15 @@ test_expect_success \
186186
echo rezrov >rezrov &&
187187
git update-index --add rezrov &&
188188
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'
190190

191191
test_expect_success \
192192
'12 - unmatching local changes being removed.' \
193193
'rm -f .git/index nitfol bozbar rezrov frotz &&
194194
read_tree_u_must_succeed --reset -u $treeH &&
195195
echo rezrov rezrov >rezrov &&
196196
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'
198198

199199
test_expect_success \
200200
'13 - unmatching local changes being removed.' \
@@ -203,7 +203,7 @@ test_expect_success \
203203
echo rezrov rezrov >rezrov &&
204204
git update-index --add rezrov &&
205205
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'
207207

208208
cat >expected <<EOF
209209
-100644 X 0 nitfol
@@ -251,7 +251,7 @@ test_expect_success \
251251
read_tree_u_must_succeed --reset -u $treeH &&
252252
echo bozbar bozbar >bozbar &&
253253
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'
255255

256256
test_expect_success \
257257
'17 - conflicting local change.' \
@@ -260,7 +260,7 @@ test_expect_success \
260260
echo bozbar bozbar >bozbar &&
261261
git update-index --add bozbar &&
262262
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'
264264

265265
test_expect_success \
266266
'18 - local change already having a good result.' \
@@ -316,7 +316,7 @@ test_expect_success \
316316
echo bozbar >bozbar &&
317317
git update-index --add bozbar &&
318318
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'
320320

321321
# Also make sure we did not break DF vs DF/DF case.
322322
test_expect_success \

0 commit comments

Comments
 (0)