X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft6030-bisect-porcelain.sh;h=3b042aacd63f77651fdaf3d10b65f4fc85669a75;hb=8f81449e885ab2b9bac09b5b835314d26f107b3f;hp=dc9e8d030a6e803ac5a022e4f0685016879edaf0;hpb=47b333f7593d7b1883062d7e6ad4069f0ff19b23;p=git.git diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index dc9e8d030..3b042aacd 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -423,7 +423,7 @@ test_expect_success 'skipped merge base when good and bad are siblings' ' grep "merge base must be tested" my_bisect_log.txt && grep $HASH4 my_bisect_log.txt && git bisect skip > my_bisect_log.txt 2>&1 && - grep "Warning" my_bisect_log.txt && + grep "warning" my_bisect_log.txt && grep $SIDE_HASH6 my_bisect_log.txt && git bisect reset '