@matheusbsbs / matheus-bagliano / commits / 20fd60bf6a
Fork 0

t1000: use "test_must_fail git frotz", not "! git frotz"

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Mar 16, 2008 at 14:13 UTC 20fd60bf6a0cbcd77c7b1f5b3b8bda224f896d60
1 file changed +18 -18
t/t1000-read-tree-m-3way.sh
+18 -18
@@ -214,7 +214,7 @@ test_expect_success '1 - must not have an entry not in A.' "
214 rm -f .git/index XX &&
215 echo XX >XX &&
216 git update-index --add XX &&
217 - ! git read-tree -m $tree_O $tree_A $tree_B
217 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
218 "
219
220 test_expect_success \
@@ -254,7 +254,7 @@ test_expect_success \
254 cp .orig-A/AN AN &&
255 echo extra >>AN &&
256 git update-index --add AN &&
257 - ! git read-tree -m $tree_O $tree_A $tree_B
257 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
258 "
259
260 test_expect_success \
@@ -271,7 +271,7 @@ test_expect_success \
271 cp .orig-A/AA AA &&
272 git update-index --add AA &&
273 echo extra >>AA &&
274 - ! git read-tree -m $tree_O $tree_A $tree_B
274 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
275 "
276
277 test_expect_success \
@@ -280,7 +280,7 @@ test_expect_success \
280 cp .orig-A/AA AA &&
281 echo extra >>AA &&
282 git update-index --add AA &&
283 - ! git read-tree -m $tree_O $tree_A $tree_B
283 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
284 "
285
286 test_expect_success \
@@ -306,7 +306,7 @@ test_expect_success \
306 cp .orig-A/LL LL &&
307 echo extra >>LL &&
308 git update-index --add LL &&
309 - ! git read-tree -m $tree_O $tree_A $tree_B
309 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
310 "
311
312 test_expect_success \
@@ -314,7 +314,7 @@ test_expect_success \
314 rm -f .git/index DD &&
315 echo DD >DD
316 git update-index --add DD &&
317 - ! git read-tree -m $tree_O $tree_A $tree_B
317 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
318 "
319
320 test_expect_success \
@@ -322,7 +322,7 @@ test_expect_success \
322 rm -f .git/index DM &&
323 cp .orig-B/DM DM &&
324 git update-index --add DM &&
325 - ! git read-tree -m $tree_O $tree_A $tree_B
325 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
326 "
327
328 test_expect_success \
@@ -330,7 +330,7 @@ test_expect_success \
330 rm -f .git/index DN &&
331 cp .orig-B/DN DN &&
332 git update-index --add DN &&
333 - ! git read-tree -m $tree_O $tree_A $tree_B
333 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
334 "
335
336 test_expect_success \
@@ -347,7 +347,7 @@ test_expect_success \
347 cp .orig-A/MD MD &&
348 git update-index --add MD &&
349 echo extra >>MD &&
350 - ! git read-tree -m $tree_O $tree_A $tree_B
350 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
351 "
352
353 test_expect_success \
@@ -356,7 +356,7 @@ test_expect_success \
356 cp .orig-A/MD MD &&
357 echo extra >>MD &&
358 git update-index --add MD &&
359 - ! git read-tree -m $tree_O $tree_A $tree_B
359 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
360 "
361
362 test_expect_success \
@@ -373,7 +373,7 @@ test_expect_success \
373 cp .orig-A/ND ND &&
374 git update-index --add ND &&
375 echo extra >>ND &&
376 - ! git read-tree -m $tree_O $tree_A $tree_B
376 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
377 "
378
379 test_expect_success \
@@ -382,7 +382,7 @@ test_expect_success \
382 cp .orig-A/ND ND &&
383 echo extra >>ND &&
384 git update-index --add ND &&
385 - ! git read-tree -m $tree_O $tree_A $tree_B
385 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
386 "
387
388 test_expect_success \
@@ -399,7 +399,7 @@ test_expect_success \
399 cp .orig-A/MM MM &&
400 git update-index --add MM &&
401 echo extra >>MM &&
402 - ! git read-tree -m $tree_O $tree_A $tree_B
402 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
403 "
404
405 test_expect_success \
@@ -408,7 +408,7 @@ test_expect_success \
408 cp .orig-A/MM MM &&
409 echo extra >>MM &&
410 git update-index --add MM &&
411 - ! git read-tree -m $tree_O $tree_A $tree_B
411 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
412 "
413
414 test_expect_success \
@@ -434,7 +434,7 @@ test_expect_success \
434 cp .orig-A/SS SS &&
435 echo extra >>SS &&
436 git update-index --add SS &&
437 - ! git read-tree -m $tree_O $tree_A $tree_B
437 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
438 "
439
440 test_expect_success \
@@ -477,7 +477,7 @@ test_expect_success \
477 cp .orig-A/NM NM &&
478 git update-index --add NM &&
479 echo extra >>NM &&
480 - ! git read-tree -m $tree_O $tree_A $tree_B
480 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
481 "
482
483 test_expect_success \
@@ -486,7 +486,7 @@ test_expect_success \
486 cp .orig-A/NM NM &&
487 echo extra >>NM &&
488 git update-index --add NM &&
489 - ! git read-tree -m $tree_O $tree_A $tree_B
489 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
490 "
491
492 test_expect_success \
@@ -512,7 +512,7 @@ test_expect_success \
512 cp .orig-A/NN NN &&
513 echo extra >>NN &&
514 git update-index --add NN &&
515 - ! git read-tree -m $tree_O $tree_A $tree_B
515 + test_must_fail git read-tree -m $tree_O $tree_A $tree_B
516 "
517
518 # #16