Merge branch 'kb/blame-author-email'

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index dc9e8d030a6e803ac5a022e4f0685016879edaf0..b5063b6fe6c37f4b41a89b71c6d52ac0b5c07127 100755 (executable)
--- 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
 '
@@ -517,13 +517,13 @@ test_expect_success '"parallel" side branch creation' '
        add_line_into_file "2(para): line 2 on parallel branch" dir2/file2 &&
        PARA_HASH2=$(git rev-parse --verify HEAD) &&
        add_line_into_file "3(para): line 3 on parallel branch" dir2/file3 &&
-       PARA_HASH3=$(git rev-parse --verify HEAD)
+       PARA_HASH3=$(git rev-parse --verify HEAD) &&
        git merge -m "merge HASH4 and PARA_HASH3" "$HASH4" &&
-       PARA_HASH4=$(git rev-parse --verify HEAD)
+       PARA_HASH4=$(git rev-parse --verify HEAD) &&
        add_line_into_file "5(para): add line on parallel branch" dir1/file1 &&
-       PARA_HASH5=$(git rev-parse --verify HEAD)
+       PARA_HASH5=$(git rev-parse --verify HEAD) &&
        add_line_into_file "6(para): add line on parallel branch" dir2/file2 &&
-       PARA_HASH6=$(git rev-parse --verify HEAD)
+       PARA_HASH6=$(git rev-parse --verify HEAD) &&
        git merge -m "merge HASH7 and PARA_HASH6" "$HASH7" &&
        PARA_HASH7=$(git rev-parse --verify HEAD)
 '