bisect: correction of typo

Signed-off-by: Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bisect.c b/bisect.c
index 03d5cd9454207d0eb6fc87768e3dc432a5b921f5..5b8357d4b312a1834d9e234b0b20e28e2d0ff76d 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -743,7 +743,7 @@ static void handle_bad_merge_base(void)
 
        fprintf(stderr, "Some good revs are not ancestor of the bad rev.\n"
                "git bisect cannot work properly in this case.\n"
 
        fprintf(stderr, "Some good revs are not ancestor of the bad rev.\n"
                "git bisect cannot work properly in this case.\n"

-               "Maybe you mistake good and bad revs?\n");
+               "Maybe you mistook good and bad revs?\n");

        exit(1);
 }
 
        exit(1);
 }
 

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 06b48681090499d681d7e7ce6b14d2a4e17e5193..9e2c20374732d790edefc4cd87aa28223fbb24c4 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -362,7 +362,7 @@ test_expect_success 'bisect starting with a detached HEAD' '
 test_expect_success 'bisect errors out if bad and good are mistaken' '
        git bisect reset &&
        test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
 test_expect_success 'bisect errors out if bad and good are mistaken' '
        git bisect reset &&
        test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&

-       grep "mistake good and bad" rev_list_error &&
+       grep "mistook good and bad" rev_list_error &&

        git bisect reset
 '
 
        git bisect reset
 '