bisect: correction of typo

CanardChouChinois · gitster · commit f6216c2c5c11 · 2015-06-23T11:41:56.000-07:00
Signed-off-by: Antoine Delaite &lt;antoine.delaite@ensimag.grenoble-inp.fr&gt;
Signed-off-by: Matthieu Moy &lt;Matthieu.Moy@imag.fr&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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"
-		"Maybe you mistake good and bad revs?\n");
+		"Maybe you mistook good and bad revs?\n");
 	exit(1);
 }
 
diff --git 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 &&
-	grep "mistake good and bad" rev_list_error &&
+	grep "mistook good and bad" rev_list_error &&
 	git bisect reset
 '
 

Original file line number	Diff line number	Diff line change
`@@ -743,7 +743,7 @@ static void handle_bad_merge_base(void)`
`743`	`743`
`744`	`744`	`fprintf(stderr, "Some good revs are not ancestor of the bad rev.\n"`
`745`	`745`	`"git bisect cannot work properly in this case.\n"`
`746`		`- "Maybe you mistake good and bad revs?\n");`
	`746`	`+ "Maybe you mistook good and bad revs?\n");`
`747`	`747`	`exit(1);`
`748`	`748`	`}`
`749`	`749`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ test_expect_success 'bisect starting with a detached HEAD' '`
`362`	`362`	`test_expect_success 'bisect errors out if bad and good are mistaken' '`
`363`	`363`	`git bisect reset &&`
`364`	`364`	`test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&`
`365`		`- grep "mistake good and bad" rev_list_error &&`
	`365`	`+ grep "mistook good and bad" rev_list_error &&`
`366`	`366`	`git bisect reset`
`367`	`367`	`'`
`368`	`368`