mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect: correction of typo

Browse Source 
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>
This commit is contained in:
Antoine Delaite
2015-06-23 14:54:40 +02:00
committed by Junio C Hamano
parent 5b1d901c01
commit f6216c2c5c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bisect.c
View File

@ -743,7 +743,7 @@ static void handle_bad_merge_base(void)
fprintf(stderr, "Some good revs are not ancestor of the bad rev.\n" fprintf(stderr, "Some good revs are not ancestor of the bad rev.\n"
"git bisect cannot work properly in this case.\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);
} }

2
t/t6030-bisect-porcelain.sh
View File

@ -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' ' test_expect_success 'bisect errors out if bad and good are mistaken' '
git bisect reset && git bisect reset &&
test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error && 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
' '