From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: gitster@pobox.com
Cc: git@vger.kernel.org, antoine.delaite@ensimag.grenoble-inp.fr,
louis--alexandre.stuber@ensimag.grenoble-inp.fr,
chriscool@tuxfamily.org, thomasxnguy@gmail.com,
valentinduperray@gmail.com, Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH v10 1/7] bisect: correction of typo
Date: Fri, 26 Jun 2015 18:58:10 +0200 [thread overview]
Message-ID: <1435337896-20709-2-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <1435337896-20709-1-git-send-email-Matthieu.Moy@imag.fr>
From: Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>
Signed-off-by: Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.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 03d5cd9..5b8357d 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
'
--
2.4.4.414.g318df7a.dirty
next prev parent reply other threads:[~2015-06-26 16:58 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-26 16:58 [PATCH v10 0/7] bisect terms Matthieu Moy
2015-06-26 16:58 ` Matthieu Moy [this message]
2015-06-26 16:58 ` [PATCH v10 2/7] Documentation/bisect: move getting help section to the end Matthieu Moy
2015-06-26 16:58 ` [PATCH v10 3/7] Documentation/bisect: revise overall content Matthieu Moy
2015-06-26 16:58 ` [PATCH v10 4/7] bisect: replace hardcoded "bad|good" by variables Matthieu Moy
2015-06-26 16:58 ` [PATCH v10 5/7] bisect: simplify the addition of new bisect terms Matthieu Moy
2015-06-26 19:22 ` Christian Couder
2015-06-26 20:32 ` [PATCH v10.1 " Matthieu Moy
2015-06-26 21:27 ` Junio C Hamano
2015-06-26 21:37 ` Matthieu Moy
2015-06-26 16:58 ` [PATCH v10 6/7] bisect: add the terms old/new Matthieu Moy
2015-06-26 16:58 ` [PATCH v10 7/7] bisect: allow any terms set by user Matthieu Moy
2015-06-26 18:16 ` Junio C Hamano
2015-06-26 20:39 ` [PATCH v10.1 " Matthieu Moy
2015-06-26 22:25 ` Junio C Hamano
2015-06-27 4:10 ` Christian Couder
2015-06-27 4:25 ` Junio C Hamano
2015-06-27 4:51 ` Christian Couder
2015-06-27 8:32 ` Matthieu Moy
2015-06-27 18:41 ` Junio C Hamano
2015-06-29 9:51 ` Matthieu Moy
2015-06-29 16:35 ` Junio C Hamano
2015-06-28 5:51 ` Michael Haggerty
2015-06-28 6:15 ` Junio C Hamano
2015-06-28 6:46 ` Michael Haggerty
2015-06-28 7:32 ` Junio C Hamano
2015-06-28 11:31 ` Michael Haggerty
2015-06-28 18:51 ` Junio C Hamano
2015-06-29 7:27 ` Matthieu Moy
2015-06-29 16:40 ` Junio C Hamano
2015-06-29 5:08 ` Christian Couder
2015-06-29 7:34 ` Matthieu Moy
2015-06-29 8:08 ` Christian Couder
2015-06-29 9:32 ` Matthieu Moy
2015-06-29 10:55 ` Christian Couder
2015-06-29 15:19 ` Matthieu Moy
2015-06-26 20:29 ` [PATCH v10 " Christian Couder
2015-06-26 20:59 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435337896-20709-2-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=thomasxnguy@gmail.com \
--cc=valentinduperray@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).