git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 1/7] bisect : correction of typo

From
Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>
Date
Jun 10, 2015, 16:24 UTC
Message-ID
<1433953472-32572-1-git-send-email-antoine.delaite@ensimag.grenoble-inp.fr>
Signed-off-by: Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>
---
 bisect.c                    |    2 +-
 t/t6030-bisect-porcelain.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bisect.c b/bisect.c
index 10f5e57..de92953 100644
--- 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
index 06b4868..9e2c203 100755
--- 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
 '
 
-- 
1.7.1
Next: Antoine Delaite
Message 1 of 9 in “bisect : correction of typo”
  1. 1/7 bisect : correction of typoAntoine Delaite, Jun 10, 2015
  2. 2/7 bisect: replace hardcoded "bad|good" by variablesAntoine Delaite, Jun 10, 2015
  3. Matthieu MoyJun 11, 2015
  4. 2/7 bisect: replace hardcoded "bad|good" by variablesAntoine Delaite, Jun 22, 2015
  5. Matthieu MoyJun 22, 2015
  6. 3/7 bisect: simplify the addition of new bisect termsAntoine Delaite, Jun 10, 2015
  7. 4/7 bisect: add the terms old/newAntoine Delaite, Jun 10, 2015
  8. Junio C HamanoJun 10, 2015
  9. Louis-Alexandre StuberJun 14, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.